chore(deps): Bump github/codeql-action/analyze from 4.36.3 to 4.37.2 (#2029)

Bumps
[github/codeql-action/analyze](https://github.com/github/codeql-action)
from 4.36.3 to 4.37.2.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/github/codeql-action/releases">github/codeql-action/analyze's
releases</a>.</em></p>
<blockquote>
<h2>v4.37.2</h2>
<ul>
<li>The new address format for the <code>config-file</code> input that
was introduced in CodeQL Action 4.37.0 is now enabled by default. In
addition to the format described there, the <code>remote=</code> prefix
can now be used to explicitly indicate that the input refers to a remote
file. All previous input formats continue to be accepted as well. <a
href="https://redirect.github.com/github/codeql-action/pull/4023">#4023</a></li>
<li>The CodeQL Action can now make use of <a
href="https://docs.github.com/en/code-security/how-tos/secure-at-scale/configure-organization-security/manage-usage-and-access/giving-org-access-private-registries">configured
private registries</a> in Default Setup to retrieve CodeQL configuration
files from remote repositories that require authentication. This will
allow customers to store their CodeQL configuration in a single
repository that can then be referenced by Default Setup workflows in
other repositories. We expect to roll this and other, related changes
out to everyone in July. <a
href="https://redirect.github.com/github/codeql-action/pull/4007">#4007</a></li>
</ul>
<h2>v4.37.1</h2>
<ul>
<li><em>Upcoming breaking change</em>: Add a deprecation warning for
customers using CodeQL version 2.20.6 and earlier. These versions of
CodeQL were discontinued on 1 July 2026 alongside GitHub Enterprise
Server 3.16, and will be unsupported by the next minor release of the
CodeQL Action. <a
href="https://redirect.github.com/github/codeql-action/pull/3956">#3956</a></li>
<li>Update default CodeQL bundle version to <a
href="https://github.com/github/codeql-action/releases/tag/codeql-bundle-v2.26.1">2.26.1</a>.
<a
href="https://redirect.github.com/github/codeql-action/pull/4019">#4019</a></li>
</ul>
<h2>v4.37.0</h2>
<ul>
<li>Update default CodeQL bundle version to <a
href="https://github.com/github/codeql-action/releases/tag/codeql-bundle-v2.26.0">2.26.0</a>.
<a
href="https://redirect.github.com/github/codeql-action/pull/3995">#3995</a></li>
<li>In addition to the existing input format, the
<code>config-file</code> input for the <code>codeql-action/init</code>
step will soon support a new <code>[owner/]repo[@ref][:path]</code>
format. All components except the repository name are optional. If
omitted, <code>owner</code> defaults to the same owner as the repository
the analysis is running for, <code>ref</code> to <code>main</code>, and
<code>path</code> to <code>.github/codeql-action.yaml</code>. Support
for this format ships in this version of the CodeQL Action, but will
only be enabled over the coming weeks. <a
href="https://redirect.github.com/github/codeql-action/pull/3973">#3973</a></li>
</ul>
</blockquote>
</details>
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/github/codeql-action/blob/main/CHANGELOG.md">github/codeql-action/analyze's
changelog</a>.</em></p>
<blockquote>
<h1>CodeQL Action Changelog</h1>
<p>See the <a
href="https://github.com/github/codeql-action/releases">releases
page</a> for the relevant changes to the CodeQL CLI and language
packs.</p>
<h2>[UNRELEASED]</h2>
<p>No user facing changes.</p>
<h2>4.37.3 - 22 Jul 2026</h2>
<p>No user facing changes.</p>
<h2>4.37.2 - 21 Jul 2026</h2>
<ul>
<li>The new address format for the <code>config-file</code> input that
was introduced in CodeQL Action 4.37.0 is now enabled by default. In
addition to the format described there, the <code>remote=</code> prefix
can now be used to explicitly indicate that the input refers to a remote
file. All previous input formats continue to be accepted as well. <a
href="https://redirect.github.com/github/codeql-action/pull/4023">#4023</a></li>
<li>The CodeQL Action can now make use of <a
href="https://docs.github.com/en/code-security/how-tos/secure-at-scale/configure-organization-security/manage-usage-and-access/giving-org-access-private-registries">configured
private registries</a> in Default Setup to retrieve CodeQL configuration
files from remote repositories that require authentication. This will
allow customers to store their CodeQL configuration in a single
repository that can then be referenced by Default Setup workflows in
other repositories. We expect to roll this and other, related changes
out to everyone in July. <a
href="https://redirect.github.com/github/codeql-action/pull/4007">#4007</a></li>
</ul>
<h2>4.37.1 - 16 Jul 2026</h2>
<ul>
<li><em>Upcoming breaking change</em>: Add a deprecation warning for
customers using CodeQL version 2.20.6 and earlier. These versions of
CodeQL were discontinued on 1 July 2026 alongside GitHub Enterprise
Server 3.16, and will be unsupported by the next minor release of the
CodeQL Action. <a
href="https://redirect.github.com/github/codeql-action/pull/3956">#3956</a></li>
<li>Update default CodeQL bundle version to <a
href="https://github.com/github/codeql-action/releases/tag/codeql-bundle-v2.26.1">2.26.1</a>.
<a
href="https://redirect.github.com/github/codeql-action/pull/4019">#4019</a></li>
</ul>
<h2>4.37.0 - 08 Jul 2026</h2>
<ul>
<li>Update default CodeQL bundle version to <a
href="https://github.com/github/codeql-action/releases/tag/codeql-bundle-v2.26.0">2.26.0</a>.
<a
href="https://redirect.github.com/github/codeql-action/pull/3995">#3995</a></li>
<li>In addition to the existing input format, the
<code>config-file</code> input for the <code>codeql-action/init</code>
step will soon support a new <code>[owner/]repo[@ref][:path]</code>
format. All components except the repository name are optional. If
omitted, <code>owner</code> defaults to the same owner as the repository
the analysis is running for, <code>ref</code> to <code>main</code>, and
<code>path</code> to <code>.github/codeql-action.yaml</code>. Support
for this format ships in this version of the CodeQL Action, but will
only be enabled over the coming weeks. <a
href="https://redirect.github.com/github/codeql-action/pull/3973">#3973</a></li>
</ul>
<h2>4.36.3 - 01 Jul 2026</h2>
<p>No user facing changes.</p>
<h2>4.36.2 - 04 Jun 2026</h2>
<ul>
<li>Cache CodeQL CLI version information across Actions steps. <a
href="https://redirect.github.com/github/codeql-action/pull/3943">#3943</a></li>
<li>Reduce requests while waiting for analysis processing by using
exponential backoff when polling SARIF processing status. <a
href="https://redirect.github.com/github/codeql-action/pull/3937">#3937</a></li>
<li>Update default CodeQL bundle version to <a
href="https://github.com/github/codeql-action/releases/tag/codeql-bundle-v2.25.6">2.25.6</a>.
<a
href="https://redirect.github.com/github/codeql-action/pull/3948">#3948</a></li>
</ul>
<h2>4.36.1 - 02 Jun 2026</h2>
<p>No user facing changes.</p>
<h2>4.36.0 - 22 May 2026</h2>
<ul>
<li><em>Breaking change</em>: Bump the minimum required CodeQL bundle
version to 2.19.4. <a
href="https://redirect.github.com/github/codeql-action/pull/3894">#3894</a></li>
<li>Add support for SHA-256 Git object IDs. <a
href="https://redirect.github.com/github/codeql-action/pull/3893">#3893</a></li>
<li>Update default CodeQL bundle version to <a
href="https://github.com/github/codeql-action/releases/tag/codeql-bundle-v2.25.5">2.25.5</a>.
<a
href="https://redirect.github.com/github/codeql-action/pull/3926">#3926</a></li>
</ul>
<h2>4.35.5 - 15 May 2026</h2>
<ul>
<li>We have improved how the JavaScript bundles for the CodeQL Action
are generated to avoid duplication across bundles and reduce the size of
the repository by around 70%. This should have no effect on the runtime
behaviour of the CodeQL Action. <a
href="https://redirect.github.com/github/codeql-action/pull/3899">#3899</a></li>
</ul>
<!-- raw HTML omitted -->
</blockquote>
<p>... (truncated)</p>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/github/codeql-action/commit/e0647621c2984b5ed2f768cb892365bf2a616ad1"><code>e064762</code></a>
Merge pull request <a
href="https://redirect.github.com/github/codeql-action/issues/4027">#4027</a>
from github/update-v4.37.2-385bcdc5a</li>
<li><a
href="https://github.com/github/codeql-action/commit/e0faed839190caa67a5cd42f1cc16246028ca3df"><code>e0faed8</code></a>
Add a couple of change notes</li>
<li><a
href="https://github.com/github/codeql-action/commit/73aad0eaa9df172668665a150d17b8bc5a650c20"><code>73aad0e</code></a>
Update changelog for v4.37.2</li>
<li><a
href="https://github.com/github/codeql-action/commit/385bcdc5afb0b5a06bd1dae7809fda5453c7664b"><code>385bcdc</code></a>
Merge pull request <a
href="https://redirect.github.com/github/codeql-action/issues/4026">#4026</a>
from github/dependabot/npm_and_yarn/tar-7.5.20</li>
<li><a
href="https://github.com/github/codeql-action/commit/de0229cea17fd9b594946f05dccc18e9c33a15d1"><code>de0229c</code></a>
Merge branch 'main' into dependabot/npm_and_yarn/tar-7.5.20</li>
<li><a
href="https://github.com/github/codeql-action/commit/115e8cbbe9419ab1ea002e5c0c6d4797d7820bf8"><code>115e8cb</code></a>
Merge pull request <a
href="https://redirect.github.com/github/codeql-action/issues/4010">#4010</a>
from github/mbg/ts/update-release-branch</li>
<li><a
href="https://github.com/github/codeql-action/commit/dbdf0b0c7d63778e4b807cb4cef00f090e7dcd4b"><code>dbdf0b0</code></a>
Bump tar from 7.5.16 to 7.5.20</li>
<li><a
href="https://github.com/github/codeql-action/commit/830c23121c8d6124ad817115f9d68da98f44eba0"><code>830c231</code></a>
Merge pull request <a
href="https://redirect.github.com/github/codeql-action/issues/4023">#4023</a>
from github/mbg/ff/remove-new-remote-file-addresses-ff</li>
<li><a
href="https://github.com/github/codeql-action/commit/69fd9e97ba2f4e95024e587c495eec0f1c9186ea"><code>69fd9e9</code></a>
Merge pull request <a
href="https://redirect.github.com/github/codeql-action/issues/4024">#4024</a>
from github/mbg/private-registry/make-docker-available</li>
<li><a
href="https://github.com/github/codeql-action/commit/b85568788a5dbb01732f9d4e0d0882e5429bb804"><code>b855687</code></a>
Always make <code>docker_registry</code> registries available</li>
<li>Additional commits viewable in <a
href="https://github.com/github/codeql-action/compare/54f647b7e1bb85c95cddabcd46b0c578ec92bc1a...e0647621c2984b5ed2f768cb892365bf2a616ad1">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=github/codeql-action/analyze&package-manager=github_actions&previous-version=4.36.3&new-version=4.37.2)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

.github/workflows/ci.yml

@@ -21,9 +21,9 @@ jobs:
         os: [ ubuntu-latest, windows-latest, macos-latest ]
 
     steps:
-      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
         with: { persist-credentials: false }
-      - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
+      - uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
         with:
           node-version-file: '.nvmrc'
       - run: npm ci
@@ -41,9 +41,9 @@ jobs:
     if: ${{ github.event_name == 'push' || github.event_name == 'pull_request' }}
 
     steps:
-      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
         with: { persist-credentials: false }
-      - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
+      - uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
         with:
           node-version-file: '.nvmrc'
       - run: npm ci
@@ -56,7 +56,7 @@ jobs:
 
       # Build and upload desktop CLI artifacts
       - name: Set up Go
-        uses: actions/setup-go@924ae3a1cded613372ab5595356fb5720e22ba16 # v6.5.0
+        uses: actions/setup-go@b7ad1dad31e06c5925ef5d2fc7ad053ef454303e # v7.0.0
         with:
           go-version: ^1.23.x
           cache-dependency-path: desktop/go.sum
@@ -90,9 +90,9 @@ jobs:
       contents: read
     steps:
       - name: Checkout
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
         with: { persist-credentials: false }
-      - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
+      - uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
         with:
           node-version-file: '.nvmrc'
       - run: npm ci
@@ -111,23 +111,27 @@ jobs:
       contents: read
     steps:
       - name: Checkout
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
         with: { persist-credentials: false }
-      - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
+      - uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
         with:
           node-version-file: '.nvmrc'
       - run: npm ci
-      - name: Cypress run
+      - run: npx playwright install --with-deps chromium
-        uses: cypress-io/github-action@fa4a118725a8f001170d49631ea89e5d66fee626 # v7.4.1
+      - name: Playwright run
-        with:
+        run: npm run test-e2e
-          build: npm run build
-          start: npm run start
-          browser: chrome
       - name: Upload coverage reports to Codecov
         uses: codecov/codecov-action@fb8b3582c8e4def4969c97caa2f19720cb33a72f # v7.0.0
         with:
-          files: ${{ github.workspace }}/.nyc_output/out.json
+          files: ${{ github.workspace }}/coverage/coverage-final.json
           verbose: true
+      - name: Upload Playwright report
+        if: ${{ !cancelled() }}
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+        with:
+          name: playwright-report
+          path: playwright-report/
+          retention-days: 7
 
   e2e-tests-docker:
     name: "E2E tests using chrome and docker"
@@ -135,20 +139,27 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
         with: { persist-credentials: false }
-      - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
+      - uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
         with:
           node-version-file: '.nvmrc'
       - run: npm ci
-      - name: Cypress run
+      - run: npx playwright install --with-deps chromium
-        uses: cypress-io/github-action@fa4a118725a8f001170d49631ea89e5d66fee626 # v7.4.1
+      - name: Build docker image
-        with:
+        run: docker build -t maputnik .
-          build: docker build -t maputnik .
+      - name: Start maputnik container
-          start: docker run --rm --network host maputnik --port=8888
+        run: docker run -d --network host --name maputnik maputnik --port=8888
-          browser: chrome
+      - name: Wait for maputnik to be ready
-      - name: Upload coverage reports to Codecov
+        run: |
-        uses: codecov/codecov-action@fb8b3582c8e4def4969c97caa2f19720cb33a72f # v7.0.0
+          for i in $(seq 1 60); do
-        with:
+            if curl -sSf http://localhost:8888/ > /dev/null; then
-          files: ${{ github.workspace }}/.nyc_output/out.json
+              echo "maputnik is up"; exit 0
-          verbose: true
+            fi
+            sleep 1
+          done
+          echo "maputnik did not start in time"; docker logs maputnik; exit 1
+      - name: Playwright run
+        run: npm run test-e2e
+        env:
+          E2E_NO_WEBSERVER: "1"

.github/workflows/codeql-analysis.yml

@@ -38,11 +38,11 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+      uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@54f647b7e1bb85c95cddabcd46b0c578ec92bc1a # v4.36.3
+      uses: github/codeql-action/init@7188fc363630916deb702c7fdcf4e481b751f97a # v4.37.1
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -67,4 +67,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@54f647b7e1bb85c95cddabcd46b0c578ec92bc1a # v4.36.3
+      uses: github/codeql-action/analyze@e0647621c2984b5ed2f768cb892365bf2a616ad1 # v4.37.2

.github/workflows/create-bump-version-pr.yml

@@ -16,13 +16,13 @@ jobs:
       run:
         shell: bash
     steps:
-      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
         with:
           fetch-depth: 0
           ref: main
 
       - name: Use Node.js from nvmrc
-        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
+        uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
         with:
           node-version-file: ".nvmrc"
 

.github/workflows/deploy.yml

@@ -12,11 +12,11 @@ jobs:
       contents: write
     if: ${{ github.event_name == 'push' }}
     steps:
-      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
         with: { persist-credentials: false }
 
       - name: Use Node.js from nvmrc
-        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
+        uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
         with:
           node-version-file: '.nvmrc'
 
@@ -50,6 +50,6 @@ jobs:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
-      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
       - run: docker build -t ghcr.io/maplibre/maputnik:main .
       - run: docker push ghcr.io/maplibre/maputnik:main

.github/workflows/release.yml

@@ -15,14 +15,14 @@ jobs:
     permissions:
       contents: read
     steps:
-      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
         with:
           fetch-depth: 0
           ref: main
           persist-credentials: false
 
       - name: Use Node.js from nvmrc
-        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
+        uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
         with:
           node-version-file: ".nvmrc"
 
@@ -42,19 +42,19 @@ jobs:
       run:
         shell: bash
     steps:
-      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
         with:
           fetch-depth: 0
           ref: main
 
       - name: Use Node.js from nvmrc
-        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
+        uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
         with:
           node-version-file: ".nvmrc"
           registry-url: "https://registry.npmjs.org"
 
       - name: Set up Go for desktop build
-        uses: actions/setup-go@924ae3a1cded613372ab5595356fb5720e22ba16 # v6.5.0
+        uses: actions/setup-go@b7ad1dad31e06c5925ef5d2fc7ad053ef454303e # v7.0.0
         with:
           go-version: ^1.23.x
           cache-dependency-path: desktop/go.sum

.gitignore

@@ -33,10 +33,14 @@ node_modules
 public
 /errorShots
 /old
-/cypress/screenshots
 /dist/
 /desktop/version.go
 
+# Playwright
+/test-results/
+/playwright-report/
+/playwright/.cache/
+
 # IDE
 .vscode/
 .idea/

.nycrc.json

@@ -4,12 +4,13 @@
   "check-coverage": false,
   "include": ["src/**/*.ts", "src/**/*.tsx"],
   "exclude": [
-    "cypress/**/*.*",
+    "e2e/**/*.*",
     "**/*.d.ts",
-    "**/*.cy.tsx",
+    "**/*.test.ts",
-    "**/*.cy.ts",
+    "**/*.test.tsx",
+    "**/*.browser.test.tsx",
     "./coverage/**",
-    "./cypress/**",
+    "./e2e/**",
     "./dist/**",
     "node_modules"
   ],

AGENTS.md

@@ -24,24 +24,127 @@ The project type checked and built with:
 npm run build
 ```
 
-To run the tests make sure that xvfb is installed:
+Install the Playwright browser (first time only):
 
 ```
-apt install xvfb
+npx playwright install --with-deps chromium
 ```
 
-Run the development server in the background with Vite:
+Then run the end-to-end tests (Playwright starts the dev server automatically):
 
 ```
-nohup npm run start &
+npm run test
 ```
 
-Then start the Cypress tests with:
+Run the unit tests with Vitest:
 
 ```
-xvfb-run -a npm run test
+npm run test-unit
 ```
 
 ## Pull Requests
 
 - Pull requests should update `CHANGELOG.md` with a short description of the change.
+
+## Testing
+
+### Prefer end-to-end tests
+
+Most of this codebase is React components, and they are only reachable from an
+end-to-end test. E2E coverage is the primary signal.
+
+Reach for a unit test only for pure logic that e2e cannot cheaply reach (parsers,
+sorting, watchers, stores). Before writing one, check whether e2e already covers
+the file — a unit test that duplicates existing e2e coverage adds test code and
+almost no coverage:
+
+```
+npx nyc report --reporter=text --include="src/libs/style.ts"
+```
+
+Do **not** merge the Vitest (v8) and e2e (istanbul) coverage reports locally. They
+produce conflicting statement maps for the same files and the combined percentage
+is meaningless. Codecov merges the two uploads server-side; that is the number to
+trust. Locally, read them separately:
+
+- e2e: `npx playwright test` then `npx nyc report --reporter=text-summary` (reads `.nyc_output/`)
+- unit: `npx vitest run --coverage` (writes `coverage/`)
+
+### E2E layering
+
+Three layers, and the boundaries matter:
+
+- `e2e/playwright-helper.ts` — generic, app-agnostic browser actions. **The only
+  file allowed to import `@playwright/test`** (besides `e2e/utils/fixtures.ts`).
+- `e2e/maputnik-driver.ts` — domain actions (layers, filters, functions, the
+  style). Knows nothing about `page` or Playwright.
+- `e2e/modal-driver.ts` — actions scoped to a modal, exposed as `when.modal.*`.
+
+Specs get a driver at describe scope and assert fluently:
+
+```ts
+describe("layer editor", () => {
+  const { given, get, when, then } = new MaputnikDriver();
+  ...
+  await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({ layers: [{ id, type: "fill" }] });
+});
+```
+
+New UI interactions belong in a driver, not inline in a spec.
+
+### Writing assertions
+
+- `shouldDeepNestedInclude` is a recursive partial match (`toMatchObject`): nested
+  objects are matched as subsets, arrays and primitives must match exactly
+  (including array length).
+- Assert against the whole style, not an extracted slice. Avoid
+  `get.styleFromLocalStorage().then(style => style.layers.find(...))` — it moves
+  test logic into the test. Compare the real object instead.
+- `Query.then()` is lazy and returns a new `Query`, **not** a Promise. `await
+  get.styleFromLocalStorage()` hangs forever. Use `.get()` to await it directly,
+  or pass the Query to `then(...)`.
+
+### One behaviour per test
+
+If a test needs comments narrating "and now this…", it is several tests. Split it,
+and hoist the shared setup into a nested `describe` + `beforeEach`.
+
+### Test ids
+
+Test ids use the `data-wd-key` attribute and are read via `get.elementByTestId`.
+
+The `Input*` components already accept `data-wd-key` and render it on the real
+`<input>`; the `Field*` wrappers forward it through their `{...props}` spread. So
+passing `data-wd-key` to a `Field*` component is usually enough. Do **not** also
+add it to `Block`/`Fieldset` — the id then matches two elements and locators fail
+in strict mode.
+
+Note `InputNumber` renders `<key>-text` and `<key>-range` when `allowRange` is set,
+and `<key>` otherwise.
+
+### Input commit semantics (common source of "the value didn't save")
+
+- `InputString` only fires its `onChange` on **blur** or **Enter**. Typing alone
+  fires `onInput`. A driver that calls `fill()` must then call `blur()`, or the
+  value never reaches the style.
+- `InputNumber` commits on every change; no blur needed.
+- The autocomplete inputs (layer source, add-layer source) are controlled
+  downshift comboboxes. Keystroke typing is dropped/reordered — `{selectall}` then
+  typing `raster` yields `"exampleaster"`. Use `fill()`, which dispatches a single
+  input event, then pick from the filtered menu.
+- CodeMirror auto-closes brackets and quotes, and types over its own closers, so
+  inserting a well-formed JSON fragment stays well-formed. To break JSON on
+  purpose, insert a bare word.
+
+### Fixtures
+
+Style fixtures live in `e2e/fixtures/`. A new one must be registered in two places
+in `maputnik-driver.ts`: the list in `given.setupMockBackedResponses` and the
+`styleFileByKey` map in `when.setStyle`.
+
+### Verify a new test can fail
+
+A test that passes for the wrong reason is worse than no test. After writing one,
+mutate the expected value and confirm it fails. This has caught real mistakes
+(e.g. a driver that never committed its input, so the assertion was matching a
+value written by the *previous* step).

CHANGELOG.md

@@ -1,6 +1,7 @@
 ## main
 
 ### ✨ Features and improvements
+- Replace Cypress with Playwright for end-to-end tests and Vitest browser mode (Playwright provider) for component tests; drop the `@shellygo/cypress-test-utils` helper in favour of a `MaputnikDriver` page object
 - _...Add new stuff here..._
 
 ### 🐞 Bug fixes

README.md

@@ -79,26 +79,45 @@ npm run sort-styles
 ```
 
 ## Tests
-For E2E testing we use [Cypress](https://www.cypress.io/)
 
- [Cypress](https://www.cypress.io/) doesn't start a server so you'll need to start one manually by running `npm run start`.
+### End-to-end tests
 
-Now open a terminal and run the following using *chrome*:
+For E2E testing we use [Playwright](https://playwright.dev/). The tests live in the [`e2e`](/e2e) directory and drive the app through the `MaputnikDriver` page object.
+
+The first time you run the tests, install the browser:
+
+```
+npx playwright install chromium
+```
+
+Playwright automatically starts the dev server (`npm run start`) for you, so you can just run:
 
 ```
 npm run test
 ```
-or *firefox*:
-```
-npm run test -- --browser firefox
-```
 
-See the following docs for more info: (Launching Browsers)[https://docs.cypress.io/guides/guides/launching-browsers]
+Some useful options:
-
-You can also see the tests as they run or select which suites to run by executing:
 
 ```
-npm run cy:open
+# see the tests run in a headed browser
+npm run test -- --headed
+
+# run a single spec / filter by title
+npm run test -- e2e/map.spec.ts
+npm run test -- -g "zoom level"
+
+# open the interactive UI mode
+npx playwright test --ui
+```
+
+Running the E2E tests also produces a code-coverage report in `coverage/` (collected via istanbul instrumentation of the dev server).
+
+### Unit & component tests
+
+Unit tests and component tests run with [Vitest](https://vitest.dev/); component tests (`*.browser.test.tsx`) use Vitest's browser mode with the Playwright provider.
+
+```
+npm run test-unit
 ```
 
 ## Release process

cypress.config.ts

@@ -1,42 +0,0 @@
-import { defineConfig } from "cypress";
-import { createRequire } from "module";
-const require = createRequire(import.meta.url);
-
-export default defineConfig({
-  env: {
-    codeCoverage: {
-      exclude: "cypress/**/*.*",
-    },
-  },
-
-  e2e: {
-    specPattern: "e2e/**/*.spec.ts",
-    setupNodeEvents(on, config) {
-      // implement node event listeners here
-      require("@cypress/code-coverage/task")(on, config);
-      on("before:browser:launch", (browser, launchOptions) => {
-        if (browser.family !== "chromium") {
-          return;
-        }
-        launchOptions.args.push("--disable-gpu");
-        launchOptions.args.push("--enable-features=AllowSwiftShaderFallback,AllowSoftwareGLFallbackDueToCrashes");
-        launchOptions.args.push("--enable-unsafe-swiftshader");
-        return launchOptions;
-      });
-      return config;
-    },
-    baseUrl: "http://localhost:8888",
-    scrollBehavior: "center",
-    retries: {
-      runMode: 2,
-      openMode: 0,
-    },
-  },
-
-  component: {
-    devServer: {
-      framework: "react",
-      bundler: "vite",
-    },
-  },
-});

cypress/support/commands.ts

@@ -1,37 +0,0 @@
-/// <reference types="cypress" />
-// ***********************************************
-// This example commands.ts shows you how to
-// create various custom commands and overwrite
-// existing commands.
-//
-// For more comprehensive examples of custom
-// commands please read more here:
-// https://on.cypress.io/custom-commands
-// ***********************************************
-//
-//
-// -- This is a parent command --
-// Cypress.Commands.add('login', (email, password) => { ... })
-//
-//
-// -- This is a child command --
-// Cypress.Commands.add('drag', { prevSubject: 'element'}, (subject, options) => { ... })
-//
-//
-// -- This is a dual command --
-// Cypress.Commands.add('dismiss', { prevSubject: 'optional'}, (subject, options) => { ... })
-//
-//
-// -- This will overwrite an existing command --
-// Cypress.Commands.overwrite('visit', (originalFn, url, options) => { ... })
-//
-// declare global {
-//   namespace Cypress {
-//     interface Chainable {
-//       login(email: string, password: string): Chainable<void>
-//       drag(subject: string, options?: Partial<TypeOptions>): Chainable<Element>
-//       dismiss(subject: string, options?: Partial<TypeOptions>): Chainable<Element>
-//       visit(originalFn: CommandOriginalFn, url: string, options: Partial<VisitOptions>): Chainable<Element>
-//     }
-//   }
-// }

cypress/support/component-index.html

@@ -1,12 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width,initial-scale=1.0">
-    <title>Components App</title>
-  </head>
-  <body>
-    <div data-cy-root></div>
-  </body>
-</html>

cypress/support/component.ts

@@ -1,37 +0,0 @@
-// ***********************************************************
-// This example support/component.ts is processed and
-// loaded automatically before your test files.
-//
-// This is a great place to put global configuration and
-// behavior that modifies Cypress.
-//
-// You can change the location of this file or turn off
-// automatically serving support files with the
-// 'supportFile' configuration option.
-//
-// You can read more here:
-// https://on.cypress.io/configuration
-// ***********************************************************
-
-// Import commands.js using ES2015 syntax:
-import "./commands";
-
-import { mount } from "cypress/react";
-
-// Augment the Cypress namespace to include type definitions for
-// your custom command.
-// Alternatively, can be defined in cypress/support/component.d.ts
-// with a <reference path="./component" /> at the top of your spec.
-declare global {
-  /* eslint-disable @typescript-eslint/no-namespace */
-  namespace Cypress {
-    interface Chainable {
-      mount: typeof mount
-    }
-  }
-}
-
-Cypress.Commands.add("mount", mount);
-
-// Example use:
-// cy.mount(<MyComponent />)

cypress/support/e2e.ts

@@ -1,22 +0,0 @@
-// ***********************************************************
-// This example support/e2e.ts is processed and
-// loaded automatically before your test files.
-//
-// This is a great place to put global configuration and
-// behavior that modifies Cypress.
-//
-// You can change the location of this file or turn off
-// automatically serving support files with the
-// 'supportFile' configuration option.
-//
-// You can read more here:
-// https://on.cypress.io/configuration
-// ***********************************************************
-
-// Import commands.js using ES2015 syntax:
-import "@cypress/code-coverage/support";
-import "cypress-plugin-tab";
-import "./commands";
-
-// Alternatively you can use CommonJS syntax:
-// require('./commands')

e2e/access-tokens.spec.ts

@@ -0,0 +1,60 @@
+import { test, expect, describe, beforeEach } from "./utils/fixtures";
+import { MaputnikDriver } from "./maputnik-driver";
+import tokens from "../src/config/tokens.json" with { type: "json" };
+
+describe("access tokens", () => {
+  const { given, when } = new MaputnikDriver();
+
+  const tileJson = {
+    tilejson: "2.2.0",
+    tiles: ["https://example.local/{z}/{x}/{y}.pbf"],
+    minzoom: 0,
+    maxzoom: 14,
+  };
+
+  beforeEach(async () => {
+    await given.setupMockBackedResponses();
+  });
+
+  test("uses the thunderforest token for a thunderforest source", async () => {
+    await given.interceptAndMockResponse({
+      method: "GET",
+      url: /tile\.thunderforest\.com\/.*/,
+      response: tileJson,
+      alias: "thunderforest",
+    });
+
+    await when.setStyle("access_tokens");
+
+    const request = await when.waitForResponse("thunderforest");
+    expect(request.url()).toContain(`apikey=${tokens.thunderforest}`);
+  });
+
+  test("uses the locationiq token for a locationiq source", async () => {
+    await given.interceptAndMockResponse({
+      method: "GET",
+      url: /tiles\.locationiq\.com\/.*/,
+      response: tileJson,
+      alias: "locationiq",
+    });
+
+    await when.setStyle("access_tokens");
+
+    const request = await when.waitForResponse("locationiq");
+    expect(request.url()).toContain(`key=${tokens.locationiq}`);
+  });
+
+  test("appends the stadia token as a query parameter", async () => {
+    await given.interceptAndMockResponse({
+      method: "GET",
+      url: /tiles\.stadiamaps\.com\/.*/,
+      response: tileJson,
+      alias: "stadia",
+    });
+
+    await when.setStyle("access_tokens");
+
+    const request = await when.waitForResponse("stadia");
+    expect(request.url()).toContain("?api_key=stadia-test-token");
+  });
+});

e2e/accessibility.spec.ts

@@ -1,42 +1,48 @@
+import { test, describe, beforeEach } from "./utils/fixtures";
 import { MaputnikDriver } from "./maputnik-driver";
 
-const test = it;
-
 describe("accessibility", () => {
-  const { beforeAndAfter, get, when, then } = new MaputnikDriver();
+  const { given, get, when, then } = new MaputnikDriver();
-  beforeAndAfter();
+
+  beforeEach(async () => {
+    await given.setupMockBackedResponses();
+    await when.setStyle("both");
+  });
 
   describe("skip links", () => {
-    beforeEach(() => {
+    beforeEach(async () => {
-      when.setStyle("layer");
+      await when.setStyle("layer");
     });
 
-    test("skip link to layer list", () => {
+    test("skip link to layer list", async () => {
       const selector = "root:skip:layer-list";
-      then(get.elementByTestId(selector)).shouldExist();
+      await then(get.elementByTestId(selector)).shouldExist();
-      when.tab();
+      await when.tab();
-      then(get.elementByTestId(selector)).shouldBeFocused();
+      await then(get.elementByTestId(selector)).shouldBeFocused();
-      when.click(selector);
+      await when.click(selector);
-      then(get.skipTargetLayerList()).shouldBeFocused();
+      await then(get.skipTargetLayerList()).shouldBeFocused();
     });
 
-    test("skip link to layer editor", () => {
+    test("skip link to layer editor", async () => {
       const selector = "root:skip:layer-editor";
-      then(get.elementByTestId(selector)).shouldExist();
+      await then(get.elementByTestId(selector)).shouldExist();
-      then(get.elementByTestId("skip-target-layer-editor")).shouldExist();
+      await then(get.elementByTestId("skip-target-layer-editor")).shouldExist();
-      when.tab().tab();
+      await when.tab();
-      then(get.elementByTestId(selector)).shouldBeFocused();
+      await when.tab();
-      when.click(selector);
+      await then(get.elementByTestId(selector)).shouldBeFocused();
-      then(get.skipTargetLayerEditor()).shouldBeFocused();
+      await when.click(selector);
+      await then(get.skipTargetLayerEditor()).shouldBeFocused();
     });
 
-    test("skip link to map view", () => {
+    test("skip link to map view", async () => {
       const selector = "root:skip:map-view";
-      then(get.elementByTestId(selector)).shouldExist();
+      await then(get.elementByTestId(selector)).shouldExist();
-      when.tab().tab().tab();
+      await when.tab();
-      then(get.elementByTestId(selector)).shouldBeFocused();
+      await when.tab();
-      when.click(selector);
+      await when.tab();
-      then(get.canvas()).shouldBeFocused();
+      await then(get.elementByTestId(selector)).shouldBeFocused();
+      await when.click(selector);
+      await then(get.canvas()).shouldBeFocused();
     });
   });
 });

e2e/code-editor.spec.ts

@@ -1,20 +1,23 @@
+import { beforeEach, describe, test } from "./utils/fixtures";
 import { MaputnikDriver } from "./maputnik-driver";
 
-const test = it;
-
 describe("code editor", () => {
-  const { beforeAndAfter, when, get, then } = new MaputnikDriver();
+  const { given, get, when, then } = new MaputnikDriver();
-  beforeAndAfter();
 
-  test("open code editor", () => {
+  beforeEach(async () => {
-    when.click("nav:code-editor");
+    await given.setupMockBackedResponses();
-    then(get.element(".maputnik-code-editor")).shouldExist();
+    await when.setStyle("both");
   });
 
-  test("closes code editor", () => {
+  test("open code editor", async () => {
-    when.click("nav:code-editor");
+    await when.click("nav:code-editor");
-    then(get.element(".maputnik-code-editor")).shouldExist();
+    await then(get.element(".maputnik-code-editor")).shouldExist();
-    when.click("nav:code-editor");
+  });
-    then(get.element(".maputnik-code-editor")).shouldNotExist();
+
+  test("closes code editor", async () => {
+    await when.click("nav:code-editor");
+    await then(get.element(".maputnik-code-editor")).shouldExist();
+    await when.click("nav:code-editor");
+    await then(get.element(".maputnik-code-editor")).shouldNotExist();
   });
 });

e2e/fixtures/access-token-style.json

@@ -0,0 +1,22 @@
+{
+  "version": 8,
+  "name": "Access token style",
+  "metadata": {
+    "maputnik:stadia_access_token": "stadia-test-token"
+  },
+  "sources": {
+    "thunderforest_transport": {
+      "type": "vector",
+      "url": "https://tile.thunderforest.com/thunderforest.transport-v2.json?apikey={key}"
+    },
+    "stadia_outdoors": {
+      "type": "vector",
+      "url": "https://tiles.stadiamaps.com/data/openmaptiles.json"
+    },
+    "locationiq": {
+      "type": "vector",
+      "url": "https://tiles.locationiq.com/v3/pbf/tiles.json?key={key}"
+    }
+  },
+  "layers": []
+}

e2e/history.spec.ts

@@ -1,126 +1,90 @@
+import { beforeEach, describe, test } from "./utils/fixtures";
 import { MaputnikDriver } from "./maputnik-driver";
 
-const test = it;
-
 describe("history", () => {
-  const { beforeAndAfter, when, get, then } = new MaputnikDriver();
+  const { given, get, when, then } = new MaputnikDriver();
-  beforeAndAfter();
 
-  let undoKeyCombo: string;
+  const undoKeyCombo = process.platform === "darwin" ? "{meta}z" : "{ctrl}z";
-  let redoKeyCombo: string;
+  const redoKeyCombo = process.platform === "darwin" ? "{meta}{shift}z" : "{ctrl}y";
 
-  before(() => {
+  beforeEach(async () => {
-    const isMac = get.isMac();
+    await given.setupMockBackedResponses();
-    undoKeyCombo = isMac ? "{meta}z" : "{ctrl}z";
+    await when.setStyle("both");
-    redoKeyCombo = isMac ? "{meta}{shift}z" : "{ctrl}y";
   });
 
-  test("undo/redo", () => {
+  test("undo/redo", async () => {
-    when.setStyle("geojson");
+    await when.setStyle("geojson");
-    when.modal.open();
+    await when.modal.open();
 
-    when.modal.fillLayers({
+    await when.modal.fillLayers({
       id: "step 1",
       type: "background",
     });
-    then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
+    await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
-      layers: [
+      layers: [{ id: "step 1", type: "background" }],
-        {
-          id: "step 1",
-          type: "background",
-        },
-      ],
     });
 
-    when.modal.open();
+    await when.modal.open();
-    when.modal.fillLayers({
+    await when.modal.fillLayers({
       id: "step 2",
       type: "background",
     });
-
+    await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
-    then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
       layers: [
-        {
+        { id: "step 1", type: "background" },
-          id: "step 1",
+        { id: "step 2", type: "background" },
-          type: "background",
-        },
-        {
-          id: "step 2",
-          type: "background",
-        },
       ],
     });
 
-    when.typeKeys(undoKeyCombo);
+    await when.typeKeys(undoKeyCombo);
-    then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
+    await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
-      layers: [
+      layers: [{ id: "step 1", type: "background" }],
-        {
-          id: "step 1",
-          type: "background",
-        },
-      ],
     });
 
-    when.typeKeys(undoKeyCombo);
+    await when.typeKeys(undoKeyCombo);
-    then(get.styleFromLocalStorage()).shouldDeepNestedInclude({ layers: [] });
+    await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({ layers: [] });
 
-    when.typeKeys(redoKeyCombo);
+    await when.typeKeys(redoKeyCombo);
-    then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
+    await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
-      layers: [
+      layers: [{ id: "step 1", type: "background" }],
-        {
-          id: "step 1",
-          type: "background",
-        },
-      ],
     });
 
-    when.typeKeys(redoKeyCombo);
+    await when.typeKeys(redoKeyCombo);
-    then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
+    await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
       layers: [
-        {
+        { id: "step 1", type: "background" },
-          id: "step 1",
+        { id: "step 2", type: "background" },
-          type: "background",
-        },
-        {
-          id: "step 2",
-          type: "background",
-        },
       ],
     });
   });
 
-  test("should not redo after undo and value change", () => {
+  test("should not redo after undo and value change", async () => {
-    when.setStyle("geojson");
+    await when.setStyle("geojson");
-    when.modal.open();
+    await when.modal.open();
-    when.modal.fillLayers({
+    await when.modal.fillLayers({
       id: "step 1",
       type: "background",
     });
 
-    when.modal.open();
+    await when.modal.open();
-    when.modal.fillLayers({
+    await when.modal.fillLayers({
       id: "step 2",
       type: "background",
     });
 
-    when.typeKeys(undoKeyCombo);
+    await when.typeKeys(undoKeyCombo);
-    when.typeKeys(undoKeyCombo);
+    await when.typeKeys(undoKeyCombo);
-    then(get.styleFromLocalStorage()).shouldDeepNestedInclude({ layers: [] });
+    await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({ layers: [] });
 
-    when.modal.open();
+    await when.modal.open();
-    when.modal.fillLayers({
+    await when.modal.fillLayers({
       id: "step 3",
       type: "background",
     });
 
-    when.typeKeys(redoKeyCombo);
+    await when.typeKeys(redoKeyCombo);
-    then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
+    await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
-      layers: [
+      layers: [{ id: "step 3", type: "background" }],
-        {
-          id: "step 3",
-          type: "background",
-        },
-      ],
     });
   });
 });

e2e/i18n.spec.ts

@@ -1,37 +1,38 @@
+import { beforeEach, describe, test } from "./utils/fixtures";
 import { MaputnikDriver } from "./maputnik-driver";
 
-const test = it;
-
 describe("i18n", () => {
-  const { beforeAndAfter, get, when, then } = new MaputnikDriver();
+  const { given, get, when, then } = new MaputnikDriver();
-  beforeAndAfter();
+
+  beforeEach(async () => {
+    await given.setupMockBackedResponses();
+    await when.setStyle("both");
+  });
 
   describe("language detector", () => {
-    test("English", () => {
+    test("English", async () => {
-      const url = "?lng=en";
+      await when.visit("?lng=en");
-      when.visit(url);
+      await then(get.elementByTestId("maputnik-lang-select")).shouldHaveValue("en");
-      then(get.elementByTestId("maputnik-lang-select")).shouldHaveValue("en");
     });
 
-    test("Japanese", () => {
+    test("Japanese", async () => {
-      const url = "?lng=ja";
+      await when.visit("?lng=ja");
-      when.visit(url);
+      await then(get.elementByTestId("maputnik-lang-select")).shouldHaveValue("ja");
-      then(get.elementByTestId("maputnik-lang-select")).shouldHaveValue("ja");
     });
   });
 
   describe("language switcher", () => {
-    beforeEach(() => {
+    beforeEach(async () => {
-      when.setStyle("layer");
+      await when.setStyle("layer");
     });
 
-    test("the language switcher switches to Japanese", () => {
+    test("the language switcher switches to Japanese", async () => {
       const selector = "maputnik-lang-select";
-      then(get.elementByTestId(selector)).shouldExist();
+      await then(get.elementByTestId(selector)).shouldExist();
-      when.select(selector, "ja");
+      await when.select(selector, "ja");
-      then(get.elementByTestId(selector)).shouldHaveValue("ja");
+      await then(get.elementByTestId(selector)).shouldHaveValue("ja");
 
-      then(get.elementByTestId("nav:settings")).shouldHaveText("スタイル設定");
+      await then(get.elementByTestId("nav:settings")).shouldHaveText("スタイル設定");
     });
   });
 });

e2e/keyboard.spec.ts

@@ -1,61 +1,66 @@
+import { beforeEach, describe, test } from "./utils/fixtures";
 import { MaputnikDriver } from "./maputnik-driver";
-const test = it;
 
 describe("keyboard", () => {
-  const { beforeAndAfter, given, when, get, then } = new MaputnikDriver();
+  const { given, get, when, then } = new MaputnikDriver();
-  beforeAndAfter();
+
+  beforeEach(async () => {
+    await given.setupMockBackedResponses();
+    await when.setStyle("both");
+  });
+
   describe("shortcuts", () => {
-    beforeEach(() => {
+    beforeEach(async () => {
-      given.setupMockBackedResponses();
+      await given.setupMockBackedResponses();
-      when.setStyle("");
+      await when.setStyle("");
     });
 
-    test("ESC should unfocus", () => {
+    test("ESC should unfocus", async () => {
       const targetSelector = "maputnik-select";
-      when.focus(targetSelector);
+      await when.focus(targetSelector);
-      then(get.elementByTestId(targetSelector)).shouldBeFocused();
+      await then(get.elementByTestId(targetSelector)).shouldBeFocused();
-      when.typeKeys("{esc}");
+      await when.typeKeys("{esc}");
-      then(get.elementByTestId(targetSelector)).shouldNotBeFocused();
+      await then(get.elementByTestId(targetSelector)).shouldNotBeFocused();
     });
 
-    test("'?' should show shortcuts modal", () => {
+    test("'?' should show shortcuts modal", async () => {
-      when.typeKeys("?");
+      await when.typeKeys("?");
-      then(get.elementByTestId("modal:shortcuts")).shouldBeVisible();
+      await then(get.elementByTestId("modal:shortcuts")).shouldBeVisible();
     });
 
-    test("'o' should show open modal", () => {
+    test("'o' should show open modal", async () => {
-      when.typeKeys("o");
+      await when.typeKeys("o");
-      then(get.elementByTestId("modal:open")).shouldBeVisible();
+      await then(get.elementByTestId("modal:open")).shouldBeVisible();
     });
 
-    test("'e' should show export modal", () => {
+    test("'e' should show export modal", async () => {
-      when.typeKeys("e");
+      await when.typeKeys("e");
-      then(get.elementByTestId("modal:export")).shouldBeVisible();
+      await then(get.elementByTestId("modal:export")).shouldBeVisible();
     });
 
-    test("'d' should show sources modal", () => {
+    test("'d' should show sources modal", async () => {
-      when.typeKeys("d");
+      await when.typeKeys("d");
-      then(get.elementByTestId("modal:sources")).shouldBeVisible();
+      await then(get.elementByTestId("modal:sources")).shouldBeVisible();
     });
 
-    test("'s' should show settings modal", () => {
+    test("'s' should show settings modal", async () => {
-      when.typeKeys("s");
+      await when.typeKeys("s");
-      then(get.elementByTestId("modal:settings")).shouldBeVisible();
+      await then(get.elementByTestId("modal:settings")).shouldBeVisible();
     });
 
-    test("'i' should change map to inspect mode", () => {
+    test("'i' should change map to inspect mode", async () => {
-      when.typeKeys("i");
+      await when.typeKeys("i");
-      then(get.inputValue("maputnik-select")).shouldEqual("inspect");
+      await then(get.inputValue("maputnik-select")).shouldEqual("inspect");
     });
 
-    test("'m' should focus map", () => {
+    test("'m' should focus map", async () => {
-      when.typeKeys("m");
+      await when.typeKeys("m");
-      then(get.canvas()).shouldBeFocused();
+      await then(get.canvas()).shouldBeFocused();
     });
 
-    test("'!' should show debug modal", () => {
+    test("'!' should show debug modal", async () => {
-      when.typeKeys("!");
+      await when.typeKeys("!");
-      then(get.elementByTestId("modal:debug")).shouldBeVisible();
+      await then(get.elementByTestId("modal:debug")).shouldBeVisible();
     });
   });
 });

e2e/layer-editor.spec.ts

@@ -1,98 +1,98 @@
-import { MaputnikDriver } from "./maputnik-driver";
 import { v1 as uuid } from "uuid";
-
+import { beforeEach, describe, test } from "./utils/fixtures";
-const test = it;
+import { MaputnikDriver } from "./maputnik-driver";
 
 describe("layer editor", () => {
-  const { beforeAndAfter, get, when, then } = new MaputnikDriver();
+  const { given, get, when, then } = new MaputnikDriver();
-  beforeAndAfter();
+
-  beforeEach(() => {
+  beforeEach(async () => {
-    when.setStyle("both");
+    await given.setupMockBackedResponses();
-    when.modal.open();
+    await when.setStyle("both");
+    await when.modal.open();
   });
 
-  function createBackground() {
+  async function createBackground() {
     const id = uuid();
 
-    when.selectWithin("add-layer.layer-type", "background");
+    await when.selectWithin("add-layer.layer-type", "background");
-    when.setValue("add-layer.layer-id.input", "background:" + id);
+    await when.setValue("add-layer.layer-id.input", "background:" + id);
 
-    when.click("add-layer");
+    await when.click("add-layer");
 
-    then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
+    await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
-      layers: [
+      layers: [{ id: "background:" + id, type: "background" }],
-        {
-          id: "background:" + id,
-          type: "background",
-        },
-      ],
     });
     return id;
   }
 
-  test("expand/collapse");
+  test("expand/collapse", async () => {
-  test("id", () => {
+    const bgId = await createBackground();
-    const bgId = createBackground();
+    await when.click("layer-list-item:background:" + bgId);
 
-    when.click("layer-list-item:background:" + bgId);
+    await then(get.elementByTestId("layer-editor.layer-id.input")).shouldBeVisible();
+
+    await when.toggleGroupInLayerEditor("Layer");
+    await then(get.elementByTestId("layer-editor.layer-id.input")).shouldNotBeVisible();
+
+    await when.toggleGroupInLayerEditor("Layer");
+    await then(get.elementByTestId("layer-editor.layer-id.input")).shouldBeVisible();
+  });
+
+  test("id", async () => {
+    const bgId = await createBackground();
+
+    await when.click("layer-list-item:background:" + bgId);
 
     const id = uuid();
-    when.setValue("layer-editor.layer-id.input", "foobar:" + id);
+    await when.setValue("layer-editor.layer-id.input", "foobar:" + id);
-    when.click("min-zoom");
+    await when.click("min-zoom");
 
-    then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
+    await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
-      layers: [
+      layers: [{ id: "foobar:" + id, type: "background" }],
-        {
-          id: "foobar:" + id,
-          type: "background",
-        },
-      ],
     });
   });
 
   describe("source", () => {
-    test("should show error when the source is invalid", () => {
+    test("should show error when the source is invalid", async () => {
-      when.modal.fillLayers({
+      await when.modal.fillLayers({
         type: "circle",
         layer: "invalid",
       });
-      then(get.element(".maputnik-input-block--error .maputnik-input-block-label")).shouldHaveCss("color", "rgb(207, 74, 74)");
+      await then(
+        get.element(".maputnik-input-block--error .maputnik-input-block-label")
+      ).shouldHaveCss("color", "rgb(207, 74, 74)");
     });
   });
 
   describe("min-zoom", () => {
     let bgId: string;
 
-    beforeEach(() => {
+    beforeEach(async () => {
-      bgId = createBackground();
+      bgId = await createBackground();
-      when.click("layer-list-item:background:" + bgId);
+      await when.click("layer-list-item:background:" + bgId);
-      when.setValue("min-zoom.input-text", "1");
+      await when.setValue("min-zoom.input-text", "1");
-      when.click("layer-editor.layer-id");
+      await when.click("layer-editor.layer-id");
     });
 
-    test("should update min-zoom in local storage", () => {
+    test("should update min-zoom in local storage", async () => {
-      then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
+      await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
-        layers: [
+        layers: [{ id: "background:" + bgId, type: "background", minzoom: 1 }],
-          {
-            id: "background:" + bgId,
-            type: "background",
-            minzoom: 1,
-          },
-        ],
       });
     });
 
-    it("when clicking next layer should update style on local storage", () => {
+    test("when clicking next layer should update style on local storage", async () => {
-      when.type("min-zoom.input-text", "{backspace}");
+      await when.type("min-zoom.input-text", "{backspace}");
-      when.click("max-zoom.input-text");
+      await when.click("max-zoom.input-text");
-      then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
+      await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
-        layers: [
+        layers: [{ id: "background:" + bgId, type: "background", minzoom: 1 }],
-          {
+      });
-            id: "background:" + bgId,
+    });
-            type: "background",
+
-            minzoom: 1,
+    test("the range slider adjusts min-zoom", async () => {
-          },
+      await when.focus("min-zoom.input-range");
-        ],
+      await when.typeKeys("{rightarrow}");
+      await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
+        layers: [{ id: "background:" + bgId, type: "background", minzoom: 2 }],
       });
     });
   });
@@ -100,22 +100,16 @@ describe("layer editor", () => {
   describe("max-zoom", () => {
     let bgId: string;
 
-    beforeEach(() => {
+    beforeEach(async () => {
-      bgId = createBackground();
+      bgId = await createBackground();
-      when.click("layer-list-item:background:" + bgId);
+      await when.click("layer-list-item:background:" + bgId);
-      when.setValue("max-zoom.input-text", "1");
+      await when.setValue("max-zoom.input-text", "1");
-      when.click("layer-editor.layer-id");
+      await when.click("layer-editor.layer-id");
     });
 
-    test("should update style in local storage", () => {
+    test("should update style in local storage", async () => {
-      then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
+      await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
-        layers: [
+        layers: [{ id: "background:" + bgId, type: "background", maxzoom: 1 }],
-          {
-            id: "background:" + bgId,
-            type: "background",
-            maxzoom: 1,
-          },
-        ],
       });
     });
   });
@@ -124,41 +118,34 @@ describe("layer editor", () => {
     let bgId: string;
     const comment = "42";
 
-    beforeEach(() => {
+    beforeEach(async () => {
-      bgId = createBackground();
+      bgId = await createBackground();
-      when.click("layer-list-item:background:" + bgId);
+      await when.click("layer-list-item:background:" + bgId);
-      when.setValue("layer-comment.input", comment);
+      await when.setValue("layer-comment.input", comment);
-      when.click("layer-editor.layer-id");
+      await when.click("layer-editor.layer-id");
     });
 
-    test("should update style in local storage", () => {
+    test("should update style in local storage", async () => {
-      then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
+      await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
         layers: [
           {
             id: "background:" + bgId,
             type: "background",
-            metadata: {
+            metadata: { "maputnik:comment": comment },
-              "maputnik:comment": comment,
-            },
           },
         ],
       });
     });
 
     describe("when unsetting", () => {
-      beforeEach(() => {
+      beforeEach(async () => {
-        when.clear("layer-comment.input");
+        await when.clear("layer-comment.input");
-        when.click("min-zoom.input-text");
+        await when.click("min-zoom.input-text");
       });
 
-      test("should update style in local storage", () => {
+      test("should update style in local storage", async () => {
-        then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
+        await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
-          layers: [
+          layers: [{ id: "background:" + bgId, type: "background" }],
-            {
-              id: "background:" + bgId,
-              type: "background",
-            },
-          ],
         });
       });
     });
@@ -166,131 +153,452 @@ describe("layer editor", () => {
 
   describe("color", () => {
     let bgId: string;
-    beforeEach(() => {
+    beforeEach(async () => {
-      bgId = createBackground();
+      bgId = await createBackground();
-      when.click("layer-list-item:background:" + bgId);
+      await when.click("layer-list-item:background:" + bgId);
-      when.click("spec-field:background-color");
+      await when.click("spec-field:background-color");
     });
 
-    test("should update style in local storage", () => {
+    test("should update style in local storage", async () => {
-      then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
+      await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
-        layers: [
+        layers: [{ id: "background:" + bgId, type: "background" }],
-          {
+      });
-            id: "background:" + bgId,
+    });
-            type: "background",
+
-          },
+    test("typing a hex value updates the paint color", async () => {
-        ],
+      await when.setColorValue("background-color", "#ff0000");
+      await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
+        layers: [{ id: "background:" + bgId, type: "background", paint: { "background-color": "#ff0000" } }],
       });
     });
   });
 
   describe("opacity", () => {
     let bgId: string;
-    beforeEach(() => {
+    beforeEach(async () => {
-      bgId = createBackground();
+      bgId = await createBackground();
-      when.click("layer-list-item:background:" + bgId);
+      await when.click("layer-list-item:background:" + bgId);
-      when.type("spec-field-input:background-opacity", "0.");
+      await when.type("spec-field-input:background-opacity", "0.");
     });
 
-    test("should keep '.' in the input field", () => {
+    test("should keep '.' in the input field", async () => {
-      then(get.elementByTestId("spec-field-input:background-opacity")).shouldHaveValue("0.");
+      await then(get.elementByTestId("spec-field-input:background-opacity")).shouldHaveValue("0.");
     });
 
-    test("should revert to a valid value when focus out", () => {
+    test("should revert to a valid value when focus out", async () => {
-      when.click("layer-list-item:background:" + bgId);
+      await when.click("layer-list-item:background:" + bgId);
-      then(get.elementByTestId("spec-field-input:background-opacity")).shouldHaveValue("0");
+      await then(get.elementByTestId("spec-field-input:background-opacity")).shouldHaveValue("0");
     });
   });
 
-
-
   describe("filter", () => {
-    test("expand/collapse");
+    let id: string;
-    test("compound filter");
+
+    beforeEach(async () => {
+      id = await when.modal.fillLayers({ type: "fill", layer: "example" });
+      await when.addFilter();
+    });
+
+    test("should add a filter item", async () => {
+      await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
+        layers: [{ id, type: "fill", source: "example", filter: ["all", ["==", "name", ""]] }],
+      });
+    });
+
+    test("should change the filter operator", async () => {
+      await when.selectFilterOperator("!=");
+      await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
+        layers: [{ id, filter: ["all", ["!=", "name", ""]] }],
+      });
+    });
+
+    test("should extend the compound filter with a second item", async () => {
+      await when.addFilter();
+      await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
+        layers: [{ id, filter: ["all", ["==", "name", ""], ["==", "name", ""]] }],
+      });
+    });
+
+    test("should change the combining operator", async () => {
+      await when.selectFilterCombiningOperator("any");
+      await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
+        layers: [{ id, filter: ["any", ["==", "name", ""]] }],
+      });
+    });
+
+    test("should delete a filter item", async () => {
+      await when.addFilter();
+      await when.deleteFilterItem();
+      await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
+        layers: [{ id, filter: ["all", ["==", "name", ""]] }],
+      });
+    });
+
+    describe("when converted to an expression", () => {
+      beforeEach(async () => {
+        await when.convertFilterToExpression();
+      });
+
+      test("should migrate the filter to an expression", async () => {
+        // A single-item "all" collapses to the bare comparison when migrated.
+        await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
+          layers: [{ id, filter: ["==", ["get", "name"], ""] }],
+        });
+      });
+
+      test("should restore the default filter when the expression is deleted", async () => {
+        await when.deleteFilterExpression();
+        await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
+          layers: [{ id, filter: ["all"] }],
+        });
+      });
+    });
+  });
+
+  describe("functions", () => {
+    let id: string;
+
+    describe("zoom function", () => {
+      beforeEach(async () => {
+        id = await when.modal.fillLayers({ type: "circle", layer: "example" });
+        await when.makeZoomFunction("circle-radius");
+      });
+
+      test("should convert the property to a zoom function", async () => {
+        await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
+          layers: [
+            { id, type: "circle", source: "example", paint: { "circle-radius": { stops: [[6, 5], [10, 5]] } } },
+          ],
+        });
+      });
+
+      test("should add a stop", async () => {
+        await when.addFunctionStop("circle-radius");
+        await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
+          layers: [{ id, paint: { "circle-radius": { stops: [[6, 5], [10, 5], [11, 5]] } } }],
+        });
+      });
+
+      test("should delete the first stop", async () => {
+        // A function needs more than two stops, otherwise deleting one collapses
+        // it back into a plain value.
+        await when.addFunctionStop("circle-radius");
+        await when.deleteFunctionStop("circle-radius");
+        await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
+          layers: [{ id, paint: { "circle-radius": { stops: [[10, 5], [11, 5]] } } }],
+        });
+      });
+
+      test("should set the base", async () => {
+        await when.setFunctionBase("circle-radius", "2");
+        await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
+          layers: [{ id, paint: { "circle-radius": { base: 2, stops: [[6, 5], [10, 5]] } } }],
+        });
+      });
+
+      test("should edit the zoom of a stop", async () => {
+        await when.setFunctionStopValue("circle-radius", "Zoom", 0, "3");
+        await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
+          layers: [{ id, paint: { "circle-radius": { stops: [[3, 5], [10, 5]] } } }],
+        });
+      });
+
+      test("should edit the output value of a stop", async () => {
+        await when.setFunctionStopValue("circle-radius", "Output value", 0, "9");
+        await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
+          layers: [{ id, paint: { "circle-radius": { stops: [[6, 9], [10, 5]] } } }],
+        });
+      });
+
+      test("should convert to an expression", async () => {
+        await when.makeExpression("circle-radius");
+        await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
+          layers: [{ id, paint: { "circle-radius": ["interpolate", ["linear"], ["zoom"], 6, 5, 10, 5] } }],
+        });
+      });
+
+      describe("when converted to a data function", () => {
+        beforeEach(async () => {
+          // Any non-interpolate scale turns the zoom function into a data one.
+          await when.selectFunctionType("circle-radius", "categorical");
+        });
+
+        test("should carry the stops over as zoom/value pairs", async () => {
+          await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
+            layers: [
+              {
+                id,
+                paint: {
+                  "circle-radius": {
+                    property: "",
+                    type: "exponential",
+                    stops: [[{ zoom: 6, value: 0 }, 5], [{ zoom: 10, value: 0 }, 5]],
+                  },
+                },
+              },
+            ],
+          });
+        });
+
+        test("should convert back to a zoom function", async () => {
+          await when.selectFunctionType("circle-radius", "interpolate");
+          await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
+            layers: [{ id, paint: { "circle-radius": { stops: [[6, 5], [10, 5]] } } }],
+          });
+        });
+      });
+    });
+
+    describe("data function", () => {
+      beforeEach(async () => {
+        id = await when.modal.fillLayers({ type: "circle", layer: "example" });
+        await when.setValue("spec-field-input:circle-blur", "1");
+        await when.makeDataFunction("circle-blur");
+      });
+
+      test("should convert the property to a data function", async () => {
+        await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
+          layers: [
+            {
+              id,
+              type: "circle",
+              source: "example",
+              paint: {
+                "circle-blur": {
+                  property: "",
+                  type: "exponential",
+                  stops: [[{ zoom: 6, value: 0 }, 1], [{ zoom: 10, value: 0 }, 1]],
+                },
+              },
+            },
+          ],
+        });
+      });
+
+      test("should add a stop", async () => {
+        await when.addFunctionStop("circle-blur");
+        await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
+          layers: [
+            {
+              id,
+              paint: {
+                "circle-blur": {
+                  stops: [[{ zoom: 6, value: 0 }, 1], [{ zoom: 10, value: 0 }, 1], [{ zoom: 11, value: 0 }, 1]],
+                },
+              },
+            },
+          ],
+        });
+      });
+
+      test("should delete the first stop", async () => {
+        await when.addFunctionStop("circle-blur");
+        await when.deleteFunctionStop("circle-blur");
+        await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
+          layers: [
+            {
+              id,
+              paint: {
+                "circle-blur": {
+                  stops: [[{ zoom: 10, value: 0 }, 1], [{ zoom: 11, value: 0 }, 1]],
+                },
+              },
+            },
+          ],
+        });
+      });
+
+      test("should set the property", async () => {
+        await when.setFunctionProperty("circle-blur", "myprop");
+        await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
+          layers: [{ id, paint: { "circle-blur": { property: "myprop" } } }],
+        });
+      });
+
+      test("should set the default", async () => {
+        await when.setFunctionDefault("circle-blur", "0.5");
+        await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
+          layers: [{ id, paint: { "circle-blur": { default: 0.5 } } }],
+        });
+      });
+
+      test("should edit the input value of a stop", async () => {
+        await when.setFunctionStopValue("circle-blur", "Input value", 0, "7");
+        await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
+          layers: [
+            {
+              id,
+              paint: {
+                "circle-blur": {
+                  stops: [[{ zoom: 6, value: 7 }, 1], [{ zoom: 10, value: 0 }, 1]],
+                },
+              },
+            },
+          ],
+        });
+      });
+
+      test("should change the function type", async () => {
+        await when.selectFunctionType("circle-blur", "categorical");
+        await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
+          layers: [{ id, paint: { "circle-blur": { type: "categorical" } } }],
+        });
+      });
+    });
+
+    describe("expression", () => {
+      beforeEach(async () => {
+        id = await when.modal.fillLayers({ type: "circle", layer: "example" });
+        await when.setValue("spec-field-input:circle-blur", "1");
+        await when.makeExpression("circle-blur");
+      });
+
+      test("should wrap the property value in a literal expression", async () => {
+        await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
+          layers: [{ id, paint: { "circle-blur": ["literal", 1] } }],
+        });
+      });
+
+      test("should restore the plain value when reverted", async () => {
+        await when.undoExpression("circle-blur");
+        await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
+          layers: [{ id, paint: { "circle-blur": 1 } }],
+        });
+      });
+
+      test("should fall back to the spec default when deleted", async () => {
+        await when.deleteExpression("circle-blur");
+        await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
+          layers: [{ id, paint: { "circle-blur": 0 } }],
+        });
+      });
+    });
   });
 
   describe("layout", () => {
-    test("text-font", () => {
+    test("text-font", async () => {
-      when.setStyle("font");
+      await when.setStyle("font");
-      when.collapseGroupInLayerEditor();
+      await when.collapseGroupInLayerEditor();
-      when.collapseGroupInLayerEditor(1);
+      await when.collapseGroupInLayerEditor(1);
-      when.collapseGroupInLayerEditor(2);
+      await when.collapseGroupInLayerEditor(2);
-      when.doWithin("spec-field:text-font", () => {
+      await when.clickWithin("spec-field:text-font", ".maputnik-autocomplete input");
-        get.element(".maputnik-autocomplete input").first().click();
+      await then(get.element(".maputnik-autocomplete-menu-item")).shouldBeVisible();
-      });
+      await then(get.element(".maputnik-autocomplete-menu-item")).shouldHaveLength(3);
-      then(get.element(".maputnik-autocomplete-menu-item")).shouldBeVisible();
-      then(get.element(".maputnik-autocomplete-menu-item")).shouldHaveLength(3);
     });
   });
 
   describe("paint", () => {
-    test("expand/collapse");
+    let id: string;
-    test("color");
+
-    test("pattern");
+    beforeEach(async () => {
-    test("opacity");
+      id = await when.modal.fillLayers({ type: "fill", layer: "example" });
+    });
+
+    test("expand/collapse", async () => {
+      await then(get.elementByTestId("spec-field:fill-color")).shouldBeVisible();
+
+      await when.toggleGroupInLayerEditor("Paint properties");
+      await then(get.elementByTestId("spec-field:fill-color")).shouldNotBeVisible();
+
+      await when.toggleGroupInLayerEditor("Paint properties");
+      await then(get.elementByTestId("spec-field:fill-color")).shouldBeVisible();
+    });
+
+    test("color", async () => {
+      await when.setColorValue("fill-color", "#ff0000");
+      await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
+        layers: [{ id, type: "fill", source: "example", paint: { "fill-color": "#ff0000" } }],
+      });
+    });
+
+    test("pattern", async () => {
+      await when.setStringValue("fill-pattern", "some-pattern");
+      await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
+        layers: [{ id, type: "fill", source: "example", paint: { "fill-pattern": "some-pattern" } }],
+      });
+    });
+
+    test("opacity", async () => {
+      await when.setValue("spec-field-input:fill-opacity", "0.4");
+      await when.click("layer-editor.layer-id");
+      await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
+        layers: [{ id, type: "fill", source: "example", paint: { "fill-opacity": 0.4 } }],
+      });
+    });
   });
 
   describe("json-editor", () => {
-    test("add", () => {
+    test("add", async () => {
-      const id = when.modal.fillLayers({
+      const id = await when.modal.fillLayers({
         type: "circle",
         layer: "example",
       });
 
-      then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
+      await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
-        layers: [
+        layers: [{ id, type: "circle", source: "example" }],
-          {
-            id: id,
-            type: "circle",
-            source: "example",
-          },
-        ],
       });
 
-      const sourceText = get.elementByText('"source"');
+      await when.clickByText('"source"');
+      await when.typeKeys('"');
 
-      sourceText.click();
+      await then(get.element(".cm-lint-marker-error")).shouldExist();
-      sourceText.type("\"");
-
-      then(get.element(".cm-lint-marker-error")).shouldExist();
     });
 
+    test("expand/collapse", async () => {
+      const bgId = await createBackground();
+      await when.click("layer-list-item:background:" + bgId);
 
-    test("expand/collapse");
+      await then(get.element(".cm-content")).shouldBeVisible();
-    test("modify");
 
-    test("parse error", () => {
+      await when.toggleGroupInLayerEditor("JSON Editor");
-      const bgId = createBackground();
+      await then(get.element(".cm-content")).shouldNotBeVisible();
 
-      when.click("layer-list-item:background:" + bgId);
+      await when.toggleGroupInLayerEditor("JSON Editor");
-      when.collapseGroupInLayerEditor();
+      await then(get.element(".cm-content")).shouldBeVisible();
-      when.collapseGroupInLayerEditor(1);
+    });
-      then(get.element(".cm-lint-marker-error")).shouldNotExist();
 
-      when.appendTextInJsonEditor(
+    test("modify", async () => {
-        "\uE013\uE013\uE013\uE013\uE013\uE013\uE013\uE013\uE013\uE013\uE013\uE013 {"
+      const bgId = await createBackground();
-      );
+      await when.click("layer-list-item:background:" + bgId);
-      then(get.element(".cm-lint-marker-error")).shouldExist();
+
+      await when.appendToJsonEditorLine('"background"', ',\n"minzoom": 5');
+      await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
+        layers: [{ id: "background:" + bgId, type: "background", minzoom: 5 }],
+      });
+    });
+
+    test("parse error", async () => {
+      const bgId = await createBackground();
+
+      await when.click("layer-list-item:background:" + bgId);
+      await when.collapseGroupInLayerEditor();
+      await when.collapseGroupInLayerEditor(1);
+      await then(get.element(".cm-lint-marker-error")).shouldNotExist();
+
+      // Inject an invalid token (CodeMirror auto-closes brackets/quotes, so a
+      // bare word reliably breaks the JSON) and expect a lint error.
+      await when.appendTextInJsonEditor("zzz");
+      await then(get.element(".cm-lint-marker-error")).shouldExist();
     });
   });
 
   describe("sticky header", () => {
-    test("should keep layer header visible when scrolling properties", () => {
+    test("should keep layer header visible when scrolling properties", async () => {
-      // Setup: Create a layer with many properties (e.g., symbol layer)
+      // Setup: Create a layer with many properties (e.g. symbol layer)
-      when.modal.fillLayers({
+      await when.modal.fillLayers({
         type: "symbol",
         layer: "example",
       });
 
-      when.wait(500);
+      await when.wait(500);
       const header = get.elementByTestId("layer-editor.header");
-      then(header).shouldBeVisible();
+      await then(header).shouldBeVisible();
 
-      get.element(".maputnik-scroll-container").scrollTo("bottom", { ensureScrollable: false });
+      await when.scrollToBottom(get.element(".maputnik-scroll-container"));
-      when.wait(200);
+      await when.wait(200);
 
-      then(header).shouldBeVisible();
+      await then(header).shouldBeVisible();
-      then(get.elementByTestId("skip-target-layer-editor")).shouldBeVisible();
+      await then(get.elementByTestId("skip-target-layer-editor")).shouldBeVisible();
     });
   });
 });

e2e/layers-list.spec.ts

@@ -1,412 +1,278 @@
+import { beforeEach, describe, test } from "./utils/fixtures";
 import { MaputnikDriver } from "./maputnik-driver";
-const test = it;
 
 describe("layers list", () => {
-  const { beforeAndAfter, get, when, then } = new MaputnikDriver();
+  const { given, get, when, then } = new MaputnikDriver();
-  beforeAndAfter();
+
-  beforeEach(() => {
+  beforeEach(async () => {
-    when.setStyle("both");
+    await given.setupMockBackedResponses();
-    when.modal.open();
+    await when.setStyle("both");
+    await when.modal.open();
   });
 
   describe("ops", () => {
     let id: string;
-    beforeEach(() => {
+    beforeEach(async () => {
-      id = when.modal.fillLayers({
+      id = await when.modal.fillLayers({ type: "background" });
-        type: "background",
-      });
     });
 
-    test("should update layers in local storage", () => {
+    test("should update layers in local storage", async () => {
-      then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
+      await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
-        layers: [
+        layers: [{ id, type: "background" }],
-          {
-            id: id,
-            type: "background",
-          },
-        ],
       });
     });
 
     describe("when clicking delete", () => {
-      beforeEach(() => {
+      beforeEach(async () => {
-        when.click("layer-list-item:" + id + ":delete");
+        await when.click("layer-list-item:" + id + ":delete");
       });
-      test("should empty layers in local storage", () => {
+      test("should empty layers in local storage", async () => {
-        then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
+        await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
           layers: [],
         });
       });
     });
 
     describe("when clicking duplicate", () => {
-      beforeEach(() => {
+      beforeEach(async () => {
-        when.click("layer-list-item:" + id + ":copy");
+        await when.click("layer-list-item:" + id + ":copy");
       });
-      test("should add copy layer in local storage", () => {
+      test("should add copy layer in local storage", async () => {
-        then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
+        await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
           layers: [
-            {
+            { id: id + "-copy", type: "background" },
-              id: id + "-copy",
+            { id, type: "background" },
-              type: "background",
-            },
-            {
-              id: id,
-              type: "background",
-            },
           ],
         });
       });
     });
 
     describe("when clicking hide", () => {
-      beforeEach(() => {
+      beforeEach(async () => {
-        when.click("layer-list-item:" + id + ":toggle-visibility");
+        await when.click("layer-list-item:" + id + ":toggle-visibility");
       });
 
-      test("should update visibility to none in local storage", () => {
+      test("should update visibility to none in local storage", async () => {
-        then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
+        await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
-          layers: [
+          layers: [{ id, type: "background", layout: { visibility: "none" } }],
-            {
-              id: id,
-              type: "background",
-              layout: {
-                visibility: "none",
-              },
-            },
-          ],
         });
       });
 
       describe("when clicking show", () => {
-        beforeEach(() => {
+        beforeEach(async () => {
-          when.click("layer-list-item:" + id + ":toggle-visibility");
+          await when.click("layer-list-item:" + id + ":toggle-visibility");
         });
 
-        test("should update visibility to visible in local storage", () => {
+        test("should update visibility to visible in local storage", async () => {
-          then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
+          await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
-            layers: [
+            layers: [{ id, type: "background", layout: { visibility: "visible" } }],
-              {
-                id: id,
-                type: "background",
-                layout: {
-                  visibility: "visible",
-                },
-              },
-            ],
           });
         });
       });
 
       describe("when selecting a layer", () => {
         let secondId: string;
-        beforeEach(() => {
+        beforeEach(async () => {
-          when.modal.open();
+          await when.modal.open();
-          secondId = when.modal.fillLayers({
+          secondId = await when.modal.fillLayers({
             id: "second-layer",
             type: "background",
           });
         });
-        test("should show the selected layer in the editor", () => {
+        test("should show the selected layer in the editor", async () => {
-          when.realClick("layer-list-item:" + secondId);
+          await when.realClick("layer-list-item:" + secondId);
-          then(get.elementByTestId("layer-editor.layer-id.input")).shouldHaveValue(secondId);
+          await then(get.elementByTestId("layer-editor.layer-id.input")).shouldHaveValue(secondId);
-          when.realClick("layer-list-item:" + id);
+          await when.realClick("layer-list-item:" + id);
-          then(get.elementByTestId("layer-editor.layer-id.input")).shouldHaveValue(id);
+          await then(get.elementByTestId("layer-editor.layer-id.input")).shouldHaveValue(id);
         });
       });
     });
   });
 
   describe("background", () => {
-    test("add", () => {
+    test("add", async () => {
-      const id = when.modal.fillLayers({
+      const id = await when.modal.fillLayers({ type: "background" });
-        type: "background",
+      await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
-      });
+        layers: [{ id, type: "background" }],
-      then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
-        layers: [
-          {
-            id: id,
-            type: "background",
-          },
-        ],
       });
     });
 
-    describe("modify", () => {});
+    test("modify", async () => {
+      const id = await when.modal.fillLayers({ type: "background" });
+      await when.click("layer-list-item:" + id);
+      await when.setValue("spec-field-input:background-opacity", "0.4");
+      await when.click("layer-editor.layer-id");
+      await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
+        layers: [{ id, type: "background", paint: { "background-opacity": 0.4 } }],
+      });
+    });
   });
 
   describe("fill", () => {
-    test("add", () => {
+    test("add", async () => {
-      const id = when.modal.fillLayers({
+      const id = await when.modal.fillLayers({ type: "fill", layer: "example" });
-        type: "fill",
+      await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
-        layer: "example",
+        layers: [{ id, type: "fill", source: "example" }],
-      });
-
-      then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
-        layers: [
-          {
-            id: id,
-            type: "fill",
-            source: "example",
-          },
-        ],
       });
     });
 
-    // TODO: Change source
+    test("change source", async () => {
-    test("change source");
+      const id = await when.modal.fillLayers({ type: "fill", layer: "example" });
+      await when.changeLayerSource("raster");
+      await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
+        layers: [{ id, type: "fill", source: "raster" }],
+      });
+    });
   });
 
   describe("line", () => {
-    test("add", () => {
+    test("add", async () => {
-      const id = when.modal.fillLayers({
+      const id = await when.modal.fillLayers({ type: "line", layer: "example" });
-        type: "line",
+      await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
-        layer: "example",
+        layers: [{ id, type: "line", source: "example" }],
-      });
-
-      then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
-        layers: [
-          {
-            id: id,
-            type: "line",
-            source: "example",
-          },
-        ],
       });
     });
 
-    test("groups", () => {
+    test("groups", async () => {
-      when.modal.open();
+      const id1 = await when.modal.fillLayers({ id: "aa", type: "line", layer: "example" });
-      const id1 = when.modal.fillLayers({
-        id: "aa",
-        type: "line",
-        layer: "example",
-      });
 
-      when.modal.open();
+      await when.modal.open();
-      const id2 = when.modal.fillLayers({
+      const id2 = await when.modal.fillLayers({ id: "aa-2", type: "line", layer: "example" });
-        id: "aa-2",
-        type: "line",
-        layer: "example",
-      });
 
-      when.modal.open();
+      await when.modal.open();
-      const id3 = when.modal.fillLayers({
+      const id3 = await when.modal.fillLayers({ id: "b", type: "line", layer: "example" });
-        id: "b",
-        type: "line",
-        layer: "example",
-      });
 
-      then(get.elementByTestId("layer-list-item:" + id1)).shouldBeVisible();
+      await then(get.elementByTestId("layer-list-item:" + id1)).shouldBeVisible();
-      then(get.elementByTestId("layer-list-item:" + id2)).shouldNotBeVisible();
+      await then(get.elementByTestId("layer-list-item:" + id2)).shouldNotBeVisible();
-      then(get.elementByTestId("layer-list-item:" + id3)).shouldBeVisible();
+      await then(get.elementByTestId("layer-list-item:" + id3)).shouldBeVisible();
-      when.click("layer-list-group:aa-0");
+      await when.click("layer-list-group:aa-0");
-      then(get.elementByTestId("layer-list-item:" + id1)).shouldBeVisible();
+      await then(get.elementByTestId("layer-list-item:" + id1)).shouldBeVisible();
-      then(get.elementByTestId("layer-list-item:" + id2)).shouldBeVisible();
+      await then(get.elementByTestId("layer-list-item:" + id2)).shouldBeVisible();
-      then(get.elementByTestId("layer-list-item:" + id3)).shouldBeVisible();
+      await then(get.elementByTestId("layer-list-item:" + id3)).shouldBeVisible();
-      when.click("layer-list-item:" + id2);
+      await when.click("layer-list-item:" + id2);
-      when.click("skip-target-layer-editor");
+      await when.click("skip-target-layer-editor");
-      when.click("menu-move-layer-down");
+      await when.click("menu-move-layer-down");
-      then(get.elementByTestId("layer-list-group:aa-0")).shouldNotExist();
+      await then(get.elementByTestId("layer-list-group:aa-0")).shouldNotExist();
-      then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
+      await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
         layers: [
-          {
+          { id: "aa", type: "line", source: "example" },
-            id: "aa",
+          { id: "b", type: "line", source: "example" },
-            type: "line",
+          { id: "aa-2", type: "line", source: "example" },
-            source: "example",
-          },
-          {
-            id: "b",
-            type: "line",
-            source: "example",
-          },
-          {
-            id: "aa-2",
-            type: "line",
-            source: "example",
-          },
         ],
       });
     });
   });
 
   describe("symbol", () => {
-    test("add", () => {
+    test("add", async () => {
-      const id = when.modal.fillLayers({
+      const id = await when.modal.fillLayers({ type: "symbol", layer: "example" });
-        type: "symbol",
+      await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
-        layer: "example",
+        layers: [{ id, type: "symbol", source: "example" }],
-      });
-
-      then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
-        layers: [
-          {
-            id: id,
-            type: "symbol",
-            source: "example",
-          },
-        ],
       });
     });
 
-    test("should show spec info when hovering and clicking single line property", () => {
+    test("should show spec info when hovering and clicking single line property", async () => {
-      when.modal.fillLayers({
+      await when.modal.fillLayers({ type: "symbol", layer: "example" });
-        type: "symbol",
-        layer: "example",
-      });
 
-      when.hover("spec-field-container:text-rotate");
+      await when.hover("spec-field-container:text-rotate");
-      then(get.elementByTestId("field-doc-button-Rotate")).shouldBeVisible();
+      await then(get.elementByTestId("field-doc-button-Rotate")).shouldBeVisible();
-      when.click("field-doc-button-Rotate", 0);
+      await when.click("field-doc-button-Rotate", 0);
-      then(get.elementByTestId("spec-field-doc")).shouldContainText("Rotates the ");
+      await then(get.elementByTestId("spec-field-doc")).shouldContainText("Rotates the ");
     });
 
-    test("should show spec info when hovering and clicking multi line property", () => {
+    test("should show spec info when hovering and clicking multi line property", async () => {
-      when.modal.fillLayers({
+      await when.modal.fillLayers({ type: "symbol", layer: "example" });
-        type: "symbol",
-        layer: "example",
-      });
 
-      when.hover("spec-field-container:text-offset");
+      await when.hover("spec-field-container:text-offset");
-      then(get.elementByTestId("field-doc-button-Offset")).shouldBeVisible();
+      await then(get.elementByTestId("field-doc-button-Offset")).shouldBeVisible();
-      when.click("field-doc-button-Offset", 0);
+      await when.click("field-doc-button-Offset", 0);
-      then(get.elementByTestId("spec-field-doc")).shouldContainText("Offset distance");
+      await then(get.elementByTestId("spec-field-doc")).shouldContainText("Offset distance");
     });
 
-    test("should hide spec info when clicking a second time", () => {
+    test("should hide spec info when clicking a second time", async () => {
-      when.modal.fillLayers({
+      await when.modal.fillLayers({ type: "symbol", layer: "example" });
-        type: "symbol",
-        layer: "example",
-      });
 
-      when.hover("spec-field-container:text-rotate");
+      await when.hover("spec-field-container:text-rotate");
-      then(get.elementByTestId("field-doc-button-Rotate")).shouldBeVisible();
+      await then(get.elementByTestId("field-doc-button-Rotate")).shouldBeVisible();
-      when.click("field-doc-button-Rotate", 0);
+      await when.click("field-doc-button-Rotate", 0);
-      when.wait(200);
+      await when.wait(200);
-      when.click("field-doc-button-Rotate", 0);
+      await when.click("field-doc-button-Rotate", 0);
-      then(get.elementByTestId("spec-field-doc")).shouldNotBeVisible();
+      await then(get.elementByTestId("spec-field-doc")).shouldNotBeVisible();
     });
   });
 
   describe("raster", () => {
-    test("add", () => {
+    test("add", async () => {
-      const id = when.modal.fillLayers({
+      const id = await when.modal.fillLayers({ type: "raster", layer: "raster" });
-        type: "raster",
+      await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
-        layer: "raster",
+        layers: [{ id, type: "raster", source: "raster" }],
-      });
-
-      then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
-        layers: [
-          {
-            id: id,
-            type: "raster",
-            source: "raster",
-          },
-        ],
       });
     });
   });
 
   describe("circle", () => {
-    test("add", () => {
+    test("add", async () => {
-      const id = when.modal.fillLayers({
+      const id = await when.modal.fillLayers({ type: "circle", layer: "example" });
-        type: "circle",
+      await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
-        layer: "example",
+        layers: [{ id, type: "circle", source: "example" }],
-      });
-
-      then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
-        layers: [
-          {
-            id: id,
-            type: "circle",
-            source: "example",
-          },
-        ],
       });
     });
   });
 
   describe("fill extrusion", () => {
-    test("add", () => {
+    test("add", async () => {
-      const id = when.modal.fillLayers({
+      const id = await when.modal.fillLayers({ type: "fill-extrusion", layer: "example" });
-        type: "fill-extrusion",
+      await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
-        layer: "example",
+        layers: [{ id, type: "fill-extrusion", source: "example" }],
-      });
-
-      then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
-        layers: [
-          {
-            id: id,
-            type: "fill-extrusion",
-            source: "example",
-          },
-        ],
       });
     });
   });
 
   describe("hillshade", () => {
-    test("add", () => {
+    test("add", async () => {
-      const id = when.modal.fillLayers({
+      const id = await when.modal.fillLayers({ type: "hillshade", layer: "example" });
-        type: "hillshade",
+      await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
-        layer: "example",
+        layers: [{ id, type: "hillshade", source: "example" }],
       });
+    });
 
-      then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
+    test("set hillshade illumination direction array", async () => {
+      const id = await when.modal.fillLayers({ type: "hillshade", layer: "example" });
+      await when.collapseGroupInLayerEditor();
+      await when.collapseGroupInLayerEditor(1);
+      await when.setValueToPropertyArray("spec-field:hillshade-illumination-direction", "1");
+      await when.addValueToPropertyArray("spec-field:hillshade-illumination-direction", "2");
+      await when.addValueToPropertyArray("spec-field:hillshade-illumination-direction", "3");
+      await when.addValueToPropertyArray("spec-field:hillshade-illumination-direction", "4");
+
+      await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
         layers: [
           {
-            id: id,
+            id,
             type: "hillshade",
             source: "example",
+            paint: { "hillshade-illumination-direction": [1, 2, 3, 4] },
           },
         ],
       });
     });
 
-    test("set hillshade illumination direction array", () => {
+    test("set hillshade highlight color array", async () => {
-      const id = when.modal.fillLayers({
+      const id = await when.modal.fillLayers({ type: "hillshade", layer: "example" });
-        type: "hillshade",
+      await when.collapseGroupInLayerEditor();
-        layer: "example",
+      await when.setValueToPropertyArray("spec-field:hillshade-highlight-color", "blue");
-      });
+      await when.addValueToPropertyArray("spec-field:hillshade-highlight-color", "#00ff00");
-      when.collapseGroupInLayerEditor();
+      await when.addValueToPropertyArray("spec-field:hillshade-highlight-color", "rgba(255, 255, 0, 1)");
-      when.collapseGroupInLayerEditor(1);
-      when.setValueToPropertyArray("spec-field:hillshade-illumination-direction", "1");
-      when.addValueToPropertyArray("spec-field:hillshade-illumination-direction", "2");
-      when.addValueToPropertyArray("spec-field:hillshade-illumination-direction", "3");
-      when.addValueToPropertyArray("spec-field:hillshade-illumination-direction", "4");
 
-      then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
+      await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
         layers: [
           {
-            id: id,
+            id,
             type: "hillshade",
             source: "example",
             paint: {
-              "hillshade-illumination-direction": [ 1, 2, 3, 4 ]
+              "hillshade-highlight-color": ["blue", "#00ff00", "rgba(255, 255, 0, 1)"],
-            }
+            },
-          },
-        ],
-      });
-    });
-
-    test("set hillshade highlight color array", () => {
-      const id = when.modal.fillLayers({
-        type: "hillshade",
-        layer: "example",
-      });
-      when.collapseGroupInLayerEditor();
-      when.setValueToPropertyArray("spec-field:hillshade-highlight-color", "blue");
-      when.addValueToPropertyArray("spec-field:hillshade-highlight-color", "#00ff00");
-      when.addValueToPropertyArray("spec-field:hillshade-highlight-color", "rgba(255, 255, 0, 1)");
-
-      then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
-        layers: [
-          {
-            id: id,
-            type: "hillshade",
-            source: "example",
-            paint: {
-              "hillshade-highlight-color": [ "blue", "#00ff00", "rgba(255, 255, 0, 1)" ]
-            }
           },
         ],
       });
@@ -414,129 +280,85 @@ describe("layers list", () => {
   });
 
   describe("color-relief", () => {
-    test("add", () => {
+    test("add", async () => {
-      const id = when.modal.fillLayers({
+      const id = await when.modal.fillLayers({ type: "color-relief", layer: "example" });
-        type: "color-relief",
+      await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
-        layer: "example",
+        layers: [{ id, type: "color-relief", source: "example" }],
-      });
-
-      then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
-        layers: [
-          {
-            id: id,
-            type: "color-relief",
-            source: "example",
-          },
-        ],
       });
     });
 
-    test("adds elevation expression when clicking the elevation button", () => {
+    test("adds elevation expression when clicking the elevation button", async () => {
-      when.modal.fillLayers({
+      await when.modal.fillLayers({ type: "color-relief", layer: "example" });
-        type: "color-relief",
+      await when.collapseGroupInLayerEditor();
-        layer: "example",
+      await when.click("make-elevation-function");
-      });
+      await then(
-      when.collapseGroupInLayerEditor();
+        get.element("[data-wd-key='spec-field-container:color-relief-color'] .cm-line")
-      when.click("make-elevation-function");
-      then(get.element("[data-wd-key='spec-field-container:color-relief-color'] .cm-line")).shouldBeVisible();
-    });
-  });
-
-  describe("groups", () => {
-    test("simple", () => {
-      when.setStyle("geojson");
-
-      when.modal.open();
-      when.modal.fillLayers({
-        id: "foo",
-        type: "background",
-      });
-
-      when.modal.open();
-      when.modal.fillLayers({
-        id: "foo_bar",
-        type: "background",
-      });
-
-      when.modal.open();
-      when.modal.fillLayers({
-        id: "foo_bar_baz",
-        type: "background",
-      });
-
-      then(get.elementByTestId("layer-list-item:foo")).shouldBeVisible();
-      then(get.elementByTestId("layer-list-item:foo_bar")).shouldNotBeVisible();
-      then(
-        get.elementByTestId("layer-list-item:foo_bar_baz")
-      ).shouldNotBeVisible();
-      when.click("layer-list-group:foo-0");
-      then(get.elementByTestId("layer-list-item:foo")).shouldBeVisible();
-      then(get.elementByTestId("layer-list-item:foo_bar")).shouldBeVisible();
-      then(
-        get.elementByTestId("layer-list-item:foo_bar_baz")
       ).shouldBeVisible();
     });
   });
 
+  describe("groups", () => {
+    test("simple", async () => {
+      await when.setStyle("geojson");
+
+      await when.modal.open();
+      await when.modal.fillLayers({ id: "foo", type: "background" });
+
+      await when.modal.open();
+      await when.modal.fillLayers({ id: "foo_bar", type: "background" });
+
+      await when.modal.open();
+      await when.modal.fillLayers({ id: "foo_bar_baz", type: "background" });
+
+      await then(get.elementByTestId("layer-list-item:foo")).shouldBeVisible();
+      await then(get.elementByTestId("layer-list-item:foo_bar")).shouldNotBeVisible();
+      await then(get.elementByTestId("layer-list-item:foo_bar_baz")).shouldNotBeVisible();
+      await when.click("layer-list-group:foo-0");
+      await then(get.elementByTestId("layer-list-item:foo")).shouldBeVisible();
+      await then(get.elementByTestId("layer-list-item:foo_bar")).shouldBeVisible();
+      await then(get.elementByTestId("layer-list-item:foo_bar_baz")).shouldBeVisible();
+    });
+  });
+
   describe("drag and drop", () => {
-    test("move layer should update local storage", () => {
+    test("move layer should update local storage", async () => {
-      when.modal.open();
+      const firstId = await when.modal.fillLayers({ id: "a", type: "background" });
-      const firstId = when.modal.fillLayers({
+      await when.modal.open();
-        id: "a",
+      const secondId = await when.modal.fillLayers({ id: "b", type: "background" });
-        type: "background",
+      await when.modal.open();
-      });
+      const thirdId = await when.modal.fillLayers({ id: "c", type: "background" });
-      when.modal.open();
-      const secondId = when.modal.fillLayers({
-        id: "b",
-        type: "background",
-      });
-      when.modal.open();
-      const thirdId = when.modal.fillLayers({
-        id: "c",
-        type: "background",
-      });
 
-      when.dragAndDropWithWait("layer-list-item:" + firstId, "layer-list-item:" + thirdId);
+      await when.dragAndDropWithWait("layer-list-item:" + firstId, "layer-list-item:" + thirdId);
 
-      then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
+      await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
         layers: [
-          {
+          { id: secondId, type: "background" },
-            id: secondId,
+          { id: thirdId, type: "background" },
-            type: "background",
+          { id: firstId, type: "background" },
-          },
-          {
-            id: thirdId,
-            type: "background",
-          },
-          {
-            id: firstId,
-            type: "background",
-          },
         ],
       });
     });
   });
 
   describe("sticky header", () => {
-    test("should keep header visible when scrolling layer list", () => {
+    test("should keep header visible when scrolling layer list", async () => {
       // Setup: Create multiple layers to enable scrolling
-      for (let i = 0; i < 20; i++) {
+      // The modal is already open (beforeEach) for the first layer.
-        when.modal.open();
+      await when.modal.fillLayers({ id: "layer-0", type: "background" });
-        when.modal.fillLayers({
+      for (let i = 1; i < 20; i++) {
-          id: `layer-${i}`,
+        await when.modal.open();
-          type: "background",
+        await when.modal.fillLayers({ id: `layer-${i}`, type: "background" });
-        });
       }
 
-      when.wait(500);
+      await when.wait(500);
       const header = get.elementByTestId("layer-list.header");
-      then(header).shouldBeVisible();
+      await then(header).shouldBeVisible();
 
-      // Scroll the layer list container (use ensureScrollable: false to avoid flakiness)
+      // Scroll the layer list container
-      get.elementByTestId("layer-list").scrollTo("bottom", { ensureScrollable: false });
+      await when.scrollToBottom(get.elementByTestId("layer-list"));
-      when.wait(200);
+      await when.wait(200);
-      then(header).shouldBeVisible();
+      await then(header).shouldBeVisible();
-      then(get.elementByTestId("layer-list:add-layer")).shouldBeVisible();
+      await then(get.elementByTestId("layer-list:add-layer")).shouldBeVisible();
     });
   });
 });

e2e/map.spec.ts

@@ -1,69 +1,67 @@
+import { beforeEach, describe, test } from "./utils/fixtures";
 import { MaputnikDriver } from "./maputnik-driver";
 
-const test = it;
-
 describe("map", () => {
-  const { beforeAndAfter, get, when, then } = new MaputnikDriver();
+  const { given, get, when, then } = new MaputnikDriver();
-  beforeAndAfter();
+
+  beforeEach(async () => {
+    await given.setupMockBackedResponses();
+    await when.setStyle("both");
+  });
+
   describe("zoom level", () => {
-    test("via url", () => {
+    test("via url", async () => {
       const zoomLevel = 12.37;
-      when.setStyle("geojson", zoomLevel);
+      await when.setStyle("geojson", zoomLevel);
-      then(get.elementByTestId("maplibre:ctrl-zoom")).shouldBeVisible();
+      await then(get.elementByTestId("maplibre:ctrl-zoom")).shouldBeVisible();
-      then(get.elementByTestId("maplibre:ctrl-zoom")).shouldContainText(
+      await then(get.elementByTestId("maplibre:ctrl-zoom")).shouldContainText("Zoom: " + zoomLevel);
-        "Zoom: " + zoomLevel
-      );
     });
 
-    test("via map controls", () => {
+    test("via map controls", async () => {
       const zoomLevel = 12.37;
-      when.setStyle("geojson", zoomLevel);
+      await when.setStyle("geojson", zoomLevel);
-      then(get.elementByTestId("maplibre:ctrl-zoom")).shouldBeVisible();
+      await then(get.elementByTestId("maplibre:ctrl-zoom")).shouldBeVisible();
-      when.clickZoomIn();
+      await when.clickZoomIn();
-      then(get.elementByTestId("maplibre:ctrl-zoom")).shouldContainText(
+      await then(get.elementByTestId("maplibre:ctrl-zoom")).shouldContainText("Zoom: " + (zoomLevel + 1));
-        "Zoom: " + (zoomLevel + 1)
-      );
     });
 
-    test("via style file definition", () => {
+    test("via style file definition", async () => {
-      when.setStyle("zoom_7_center_0_51");
+      await when.setStyle("zoom_7_center_0_51");
-      then(get.elementByTestId("maplibre:ctrl-zoom")).shouldBeVisible();
+      await then(get.elementByTestId("maplibre:ctrl-zoom")).shouldBeVisible();
-      then(get.elementByTestId("maplibre:ctrl-zoom")).shouldContainText(
+      await then(get.elementByTestId("maplibre:ctrl-zoom")).shouldContainText("Zoom: " + 7);
-        "Zoom: " + (7)
+      await then(get.locationHash()).shouldInclude("#7/51/0");
-      );
-      then(get.locationHash().should("contain", "#7/51/0"));
 
       // opening another stylefile does not update the map view again
       // as discussed in https://github.com/maplibre/maputnik/issues/1546
-      when.openASecondStyleWithDifferentZoomAndCenter();
+      await when.openASecondStyleWithDifferentZoomAndCenter();
-      then(get.locationHash().should("contain", "#7/51/0"));
+      await then(get.locationHash()).shouldInclude("#7/51/0");
-
     });
   });
 
   describe("search", () => {
-    test("should exist", () => {
+    test("should exist", async () => {
-      then(get.searchControl()).shouldBeVisible();
+      await then(get.searchControl()).shouldBeVisible();
     });
   });
 
   describe("popup", () => {
-    beforeEach(() => {
+    beforeEach(async () => {
-      when.setStyle("rectangles");
+      await when.setStyle("rectangles");
-      then(get.locationHash().should("exist"));
+      await then(get.locationHash()).shouldExist();
-    });
-    test("should open on feature click", () => {
-      when.clickCenter("maplibre:map");
-      then(get.elementByTestId("feature-layer-popup")).shouldBeVisible();
     });
 
-    test("should open a second feature after closing popup", () => {
+    test("should open on feature click", async () => {
-      when.clickCenter("maplibre:map");
+      await when.clickCenter("maplibre:map");
-      then(get.elementByTestId("feature-layer-popup")).shouldBeVisible();
+      await then(get.elementByTestId("feature-layer-popup")).shouldBeVisible();
-      when.closePopup();
+    });
-      then(get.elementByTestId("feature-layer-popup")).shouldNotExist();
+
-      when.clickCenter("maplibre:map");
+    test("should open a second feature after closing popup", async () => {
-      then(get.elementByTestId("feature-layer-popup")).shouldBeVisible();
+      await when.clickCenter("maplibre:map");
+      await then(get.elementByTestId("feature-layer-popup")).shouldBeVisible();
+      await when.closePopup();
+      await then(get.elementByTestId("feature-layer-popup")).shouldNotExist();
+      await when.clickCenter("maplibre:map");
+      await then(get.elementByTestId("feature-layer-popup")).shouldBeVisible();
     });
   });
 });

e2e/maputnik-cypress-helper.ts

@@ -1,56 +0,0 @@
-/// <reference types="cypress-real-events" />
-import { CypressHelper } from "@shellygo/cypress-test-utils";
-import "cypress-real-events/support";
-
-export default class MaputnikCypressHelper {
-  private helper = new CypressHelper({ defaultDataAttribute: "data-wd-key" });
-
-  public given = {
-    ...this.helper.given,
-  };
-
-  public get = {
-    locationHash: (): Cypress.Chainable<string> => cy.location("hash"),
-    ...this.helper.get,
-  };
-
-  public when = {
-    dragAndDropWithWait: (element: string, targetElement: string) => {
-      this.helper.get.elementByTestId(element).realMouseDown({ button: "left", position: "center" });
-      this.helper.get.elementByTestId(element).realMouseMove(0, 10, { position: "center" });
-      this.helper.get.elementByTestId(targetElement).realMouseMove(0, 0, { position: "center" });
-      this.helper.when.wait(1);
-      this.helper.get.elementByTestId(targetElement).realMouseUp();
-    },
-    clickCenter: (element: string) => {
-      this.helper.get.elementByTestId(element).realMouseDown({ button: "left", position: "center" });
-      this.helper.when.wait(200);
-      this.helper.get.elementByTestId(element).realMouseUp();
-    },
-    openFileByFixture: (fixture: string, buttonTestId: string, inputTestId: string) => {
-      cy.window().then((win) => {
-        const file = {
-          text: cy.stub().resolves(cy.fixture(fixture).then(JSON.stringify)),
-        };
-        const fileHandle = {
-          getFile: cy.stub().resolves(file),
-        };
-        if (!win.showOpenFilePicker) {
-          this.helper.get.elementByTestId(inputTestId).selectFile("cypress/fixtures/" + fixture, { force: true });
-        } else {
-          cy.stub(win, "showOpenFilePicker").resolves([fileHandle]);
-          this.helper.get.elementByTestId(buttonTestId).click();
-        }
-      });
-    },
-    dropFileByFixture: (fixture: string, dropzoneTestId: string) => {
-      this.helper.get.elementByTestId(dropzoneTestId).selectFile("cypress/fixtures/" + fixture, {
-        action: "drag-drop",
-        force: true,
-      });
-    },
-    ...this.helper.when,
-  };
-
-  public beforeAndAfter = this.helper.beforeAndAfter;
-}

e2e/maputnik-driver.ts

@@ -1,122 +1,56 @@
-/// <reference types="cypress-plugin-tab" />
+import { PlaywrightHelper } from "./playwright-helper";
+import { ModalDriver } from "./modal-driver";
 
-import { CypressHelper } from "@shellygo/cypress-test-utils";
-import { Assertable, then } from "@shellygo/cypress-test-utils/assertable";
-import MaputnikCypressHelper from "./maputnik-cypress-helper";
-import ModalDriver from "./modal-driver";
 const baseUrl = "http://localhost:8888/";
+const isMac = process.platform === "darwin";
 
-const styleFromWindow = (win: Window) => {
+/**
-  const styleId = win.localStorage.getItem("maputnik:latest_style");
+ * The maputnik-specific driver. It builds on the generic {@link PlaywrightHelper}
-  const styleItemKey = `maputnik:style:${styleId}`;
+ * — spreading its `given`/`when`/`get` primitives and adding domain concepts
-  const styleItem = win.localStorage.getItem(styleItemKey);
+ * (loading a style, the add-layer modal, the JSON editor, …). All Playwright
-  if (!styleItem) throw new Error("Could not get styleItem from localStorage");
+ * access goes through the helper; the driver never touches `page` directly.
-  const obj = JSON.parse(styleItem);
+ */
-  return obj;
-};
-
-export class MaputnikAssertable<T> extends Assertable<T> {
-  shouldEqualToStoredStyle = () =>
-    then(
-      new CypressHelper().get.window().then((win: Window) => {
-        const style = styleFromWindow(win);
-        then(this.chainable).shouldDeepNestedInclude(style);
-      })
-    );
-}
-
 export class MaputnikDriver {
-  private helper = new MaputnikCypressHelper();
+  private readonly helper = new PlaywrightHelper();
-  private modalDriver = new ModalDriver();
+  private readonly modalDriver = new ModalDriver();
 
-  public beforeAndAfter = () => {
+  then = this.helper.then;
-    beforeEach(() => {
-      this.given.setupMockBackedResponses();
-      this.when.setStyle("both");
-    });
-  };
 
-  public then = (chainable: Cypress.Chainable<any>) =>
+  /** Reads the maputnik style currently persisted in localStorage. */
-    new MaputnikAssertable(chainable);
+  private async readStoredStyle(): Promise<any> {
+    const styleId = await this.helper.get.localStorageItem("maputnik:latest_style");
+    const styleItem = await this.helper.get.localStorageItem(`maputnik:style:${styleId}`);
+    if (!styleItem) throw new Error("Could not get styleItem from localStorage");
+    return JSON.parse(styleItem);
+  }
 
   public given = {
     ...this.helper.given,
-    setupMockBackedResponses: () => {
+
-      this.helper.given.interceptAndMockResponse({
+    setupMockBackedResponses: async () => {
-        method: "GET",
+      const styleFixtures = [
-        url: baseUrl + "example-style.json",
+        "example-style.json",
-        response: {
+        "example-layer-style.json",
-          fixture: "example-style.json",
+        "geojson-style.json",
-        },
+        "raster-style.json",
-        alias: "example-style.json",
+        "geojson-raster-style.json",
-      });
+        "rectangles-style.json",
-      this.helper.given.interceptAndMockResponse({
+        "example-style-with-fonts.json",
-        method: "GET",
+        "example-style-with-zoom-7-and-center-0-51.json",
-        url: baseUrl + "example-layer-style.json",
+        "example-style-with-zoom-5-and-center-50-50.json",
-        response: {
+        "access-token-style.json",
-          fixture: "example-layer-style.json",
+      ];
-        },
+      for (const fixture of styleFixtures) {
-      });
+        await this.helper.given.interceptAndMockResponse({
-      this.helper.given.interceptAndMockResponse({
+          method: "GET",
-        method: "GET",
+          url: baseUrl + fixture,
-        url: baseUrl + "geojson-style.json",
+          response: { fixture },
-        response: {
+          alias: fixture === "example-style.json" ? "example-style.json" : undefined,
-          fixture: "geojson-style.json",
+        });
-        },
+      }
-      });
+      await this.helper.given.interceptAndMockResponse({ method: "GET", url: /example\.local\//, response: [] });
-      this.helper.given.interceptAndMockResponse({
+      await this.helper.given.interceptAndMockResponse({ method: "GET", url: /example\.com\//, response: [] });
-        method: "GET",
+      await this.helper.given.interceptAndMockResponse({
-        url: baseUrl + "raster-style.json",
-        response: {
-          fixture: "raster-style.json",
-        },
-      });
-      this.helper.given.interceptAndMockResponse({
-        method: "GET",
-        url: baseUrl + "geojson-raster-style.json",
-        response: {
-          fixture: "geojson-raster-style.json",
-        },
-      });
-      this.helper.given.interceptAndMockResponse({
-        method: "GET",
-        url: baseUrl + "rectangles-style.json",
-        response: {
-          fixture: "rectangles-style.json",
-        },
-      });
-      this.helper.given.interceptAndMockResponse({
-        method: "GET",
-        url: baseUrl + "example-style-with-fonts.json",
-        response: {
-          fixture: "example-style-with-fonts.json",
-        },
-      });
-      this.helper.given.interceptAndMockResponse({
-        method: "GET",
-        url: baseUrl + "example-style-with-zoom-7-and-center-0-51.json",
-        response: {
-          fixture: "example-style-with-zoom-7-and-center-0-51.json",
-        },
-      });
-      this.helper.given.interceptAndMockResponse({
-        method: "GET",
-        url: baseUrl + "example-style-with-zoom-5-and-center-50-50.json",
-        response: {
-          fixture: "example-style-with-zoom-5-and-center-50-50.json",
-        },
-      });
-      this.helper.given.interceptAndMockResponse({
-        method: "GET",
-        url: "*example.local/*",
-        response: [],
-      });
-      this.helper.given.interceptAndMockResponse({
-        method: "GET",
-        url: "*example.com/*",
-        response: [],
-      });
-      this.helper.given.interceptAndMockResponse({
         method: "GET",
         url: "https://www.glyph-server.com/*",
         response: ["Font 1", "Font 2", "Font 3"],
@@ -126,147 +60,299 @@ export class MaputnikDriver {
 
   public when = {
     ...this.helper.when,
+
     modal: this.modalDriver.when,
-    doWithin: (selector: string, fn: () => void) => {
+
-      this.helper.when.doWithin(fn, selector);
+    setStyle: async (
-    },
+      styleProperties:
-    tab: () => this.helper.get.element("body").tab(),
+        | "geojson"
-    waitForExampleFileResponse: () => {
+        | "raster"
-      this.helper.when.waitForResponse("example-style.json");
+        | "both"
-    },
+        | "layer"
-    openASecondStyleWithDifferentZoomAndCenter: () => {
+        | "rectangles"
-      cy.contains("button", "Open").click();
+        | "font"
-      cy.get('[data-wd-key="modal:open.url.input"]')
+        | "zoom_7_center_0_51"
-        .should("be.enabled")
+        | "access_tokens"
-        .clear()
+        | "",
-        .type("http://localhost:8888/example-style-with-zoom-5-and-center-50-50.json{enter}");
-    },
-    chooseExampleFile: () => {
-      this.helper.given.fixture("example-style.json", "example-style.json");
-      this.helper.when.openFileByFixture("example-style.json", "modal:open.dropzone", "modal:open.file.input");
-      this.helper.when.wait(200);
-    },
-    dropExampleFile: () => {
-      this.helper.given.fixture("example-style.json", "example-style.json");
-      this.helper.when.dropFileByFixture("example-style.json", "modal:open.dropzone");
-      this.helper.when.wait(200);
-    },
-    setStyle: (
-      styleProperties: "geojson" | "raster" | "both" | "layer" | "rectangles" | "font" | "zoom_7_center_0_51" | "",
       zoom?: number
     ) => {
-      const url = new URL(baseUrl);
+      const styleFileByKey: Record<string, string> = {
-      switch (styleProperties) {
+        geojson: "geojson-style.json",
-        case "geojson":
+        raster: "raster-style.json",
-          url.searchParams.set("style", baseUrl + "geojson-style.json");
+        both: "geojson-raster-style.json",
-          break;
+        layer: "example-layer-style.json",
-        case "raster":
+        rectangles: "rectangles-style.json",
-          url.searchParams.set("style", baseUrl + "raster-style.json");
+        font: "example-style-with-fonts.json",
-          break;
+        zoom_7_center_0_51: "example-style-with-zoom-7-and-center-0-51.json",
-        case "both":
+        access_tokens: "access-token-style.json",
-          url.searchParams.set("style", baseUrl + "geojson-raster-style.json");
+      };
-          break;
-        case "layer":
-          url.searchParams.set("style", baseUrl + "example-layer-style.json");
-          break;
-        case "rectangles":
-          url.searchParams.set("style", baseUrl + "rectangles-style.json");
-          break;
-        case "font":
-          url.searchParams.set("style", baseUrl + "example-style-with-fonts.json");
-          break;
-        case "zoom_7_center_0_51":
-          url.searchParams.set("style", baseUrl + "example-style-with-zoom-7-and-center-0-51.json");
-          break;
-      }
 
+      const url = new URL(baseUrl);
+      if (styleProperties && styleFileByKey[styleProperties]) {
+        url.searchParams.set("style", baseUrl + styleFileByKey[styleProperties]);
+      }
       if (zoom) {
         url.hash = `${zoom}/41.3805/2.1635`;
       }
-      this.helper.when.visit(url.toString());
+
-      if (styleProperties) {
+      await this.helper.when.visit(url.toString());
-        this.helper.when.acceptConfirm();
+
-      }
-      // when methods should not include assertions
       const toolbarLink = this.helper.get.elementByTestId("toolbar:link");
-      toolbarLink.scrollIntoView();
+      await toolbarLink.scrollIntoViewIfNeeded();
-      toolbarLink.should("be.visible");
+      await this.then(toolbarLink).shouldBeVisible();
     },
 
-    typeKeys: (keys: string) => this.helper.get.element("body").type(keys),
+    openASecondStyleWithDifferentZoomAndCenter: async () => {
-
+      await this.helper.when.clickButtonByName("Open");
-    clickZoomIn: () => {
+      const input = this.helper.get.elementByTestId("modal:open.url.input");
-      this.helper.get.element(".maplibregl-ctrl-zoom-in").click();
+      await input.fill("http://localhost:8888/example-style-with-zoom-5-and-center-50-50.json");
+      await input.press("Enter");
     },
 
-    selectWithin: (selector: string, value: string) => {
+    chooseExampleFile: async () => {
-      this.when.doWithin(selector, () => {
+      await this.helper.when.openFileByFixture("example-style.json", "modal:open.dropzone");
-        this.helper.get.element("select").select(value);
+      await this.helper.when.wait(200);
-      });
     },
 
-    select: (selector: string, value: string) => {
+    /** Picks the example style through the browser's native file chooser. */
-      this.helper.get.elementByTestId(selector).select(value);
+    chooseExampleFileFromPicker: async () => {
+      await this.helper.when.chooseFileFromPicker("example-style.json", "modal:open.dropzone");
+      await this.helper.when.wait(200);
     },
 
-    focus: (selector: string) => {
+    dropExampleFile: async () => {
-      this.helper.when.focus(selector);
+      await this.helper.when.dropFileByFixture("example-style.json", "modal:open.dropzone");
+      await this.helper.when.wait(200);
     },
 
-    setValue: (selector: string, text: string) => {
+    clickZoomIn: async () => {
-      this.helper.get
+      await this.helper.get.element(".maplibregl-ctrl-zoom-in").click();
-        .elementByTestId(selector)
-        .clear()
-        .type(text, { parseSpecialCharSequences: false });
     },
 
-    setValueToPropertyArray: (selector: string, value: string) => {
+    closePopup: async () => {
-      this.when.doWithin(selector, () => {
+      await this.helper.get.element(".maplibregl-popup-close-button").click();
-        this.helper.get.element(".maputnik-array-block-content input").last().type("{selectall}"+value, {force: true });
-      });
     },
 
-    addValueToPropertyArray: (selector: string, value: string) => {
+    collapseGroupInLayerEditor: async (index = 0) => {
-      this.when.doWithin(selector, () => {
+      await this.helper.get.element(".maputnik-layer-editor-group__button").nth(index).click();
-        this.helper.get.element(".maputnik-array-add-value").click({ force: true });
-        this.helper.get.element(".maputnik-array-block-content input").last().type("{selectall}"+value, {force: true });
-      });
     },
 
-    closePopup: () => {
+    /** Expands/collapses a layer-editor group by its title, e.g. "Paint properties". */
-      this.helper.get.element(".maplibregl-popup-close-button").click();
+    toggleGroupInLayerEditor: async (title: string) => {
+      await this.helper.when.click("layer-editor-group:" + title);
     },
 
-    collapseGroupInLayerEditor: (index = 0) => {
+    /**
-      this.helper.get.element(".maputnik-layer-editor-group__button").eq(index).realClick();
+     * Picks a source for the selected layer from the source autocomplete.
+     * The autocomplete is a controlled (downshift) input, so the value has to be
+     * filled rather than typed key by key, then chosen from the filtered menu.
+     */
+    changeLayerSource: async (sourceId: string) => {
+      const input = this.helper.get.elementByTestId("layer-editor.layer-source").locator("input");
+      await input.fill(sourceId);
+      await this.helper.get.element(".maputnik-autocomplete-menu-item").first().click();
     },
 
-    appendTextInJsonEditor: (text: string) => {
+    appendTextInJsonEditor: async (text: string) => {
-      this.helper.get.element(".cm-line").first().click().type(text, { parseSpecialCharSequences: false });
+      await this.helper.get.element(".cm-line").first().click();
+      // Move to the very start of the document so the inserted text breaks the
+      // root JSON structure (CodeMirror auto-closes brackets otherwise).
+      await this.helper.when.typeKeys("{home}");
+      await this.helper.when.typeText(text);
     },
 
-    setTextInJsonEditor: (text: string) => {
+    setTextInJsonEditor: async (text: string) => {
-      this.helper.get.element(".cm-line").first().click().clear().type(text, { parseSpecialCharSequences: false });
+      await this.helper.get.element(".cm-line").first().click();
-    }
+      await this.helper.when.typeKeys("{selectall}");
+      await this.helper.when.typeText(text);
+    },
+
+    setValueToPropertyArray: async (selector: string, value: string) => {
+      const input = this.helper.get.elementByTestId(selector).locator(".maputnik-array-block-content input").last();
+      await input.focus();
+      await this.helper.when.typeKeys("{selectall}");
+      await this.helper.when.typeText(value);
+    },
+
+    addValueToPropertyArray: async (selector: string, value: string) => {
+      const block = this.helper.get.elementByTestId(selector);
+      await block.locator(".maputnik-array-add-value").click();
+      const input = block.locator(".maputnik-array-block-content input").last();
+      await input.focus();
+      await this.helper.when.typeKeys("{selectall}");
+      await this.helper.when.typeText(value);
+    },
+
+    makeZoomFunction: async (fieldName: string) => {
+      const container = this.helper.get.elementByTestId("spec-field-container:" + fieldName);
+      await container.scrollIntoViewIfNeeded();
+      await container.locator(".maputnik-make-zoom-function").last().click({ force: true });
+    },
+
+    makeDataFunction: async (fieldName: string) => {
+      const container = this.helper.get.elementByTestId("spec-field-container:" + fieldName);
+      await container.scrollIntoViewIfNeeded();
+      await container.locator(".maputnik-make-data-function").click({ force: true });
+    },
+
+    addFunctionStop: async (fieldName: string) => {
+      const container = this.helper.get.elementByTestId("spec-field-container:" + fieldName);
+      await container.locator(".maputnik-add-stop").first().click({ force: true });
+    },
+
+    deleteFunctionStop: async (fieldName: string) => {
+      const container = this.helper.get.elementByTestId("spec-field-container:" + fieldName);
+      await container.locator(".maputnik-delete-stop").first().click({ force: true });
+    },
+
+    /** Turns the property into a raw style expression. */
+    makeExpression: async (fieldName: string) => {
+      const container = this.helper.get.elementByTestId("spec-field-container:" + fieldName);
+      await container.scrollIntoViewIfNeeded();
+      // In the plain spec field the expression button shares the zoom-function
+      // class and comes first; inside a function editor it has its own test id.
+      const inFunctionEditor = container.locator("[data-wd-key='convert-to-expression']");
+      const button =
+        (await inFunctionEditor.count()) > 0
+          ? inFunctionEditor
+          : container.locator(".maputnik-make-zoom-function").first();
+      await button.click({ force: true });
+    },
+
+    /** Reverts an expression back to a plain value. */
+    undoExpression: async (fieldName: string) => {
+      const container = this.helper.get.elementByTestId("spec-field-container:" + fieldName);
+      await container.locator("[data-wd-key='undo-expression']").click({ force: true });
+    },
+
+    /** Removes an expression, restoring the property's spec default. */
+    deleteExpression: async (fieldName: string) => {
+      const container = this.helper.get.elementByTestId("spec-field-container:" + fieldName);
+      await container.locator("[data-wd-key='delete-expression']").click({ force: true });
+    },
+
+    /** Picks the function scale (categorical/interval/exponential/identity/interpolate). */
+    selectFunctionType: async (fieldName: string, type: string) => {
+      const container = this.helper.get.elementByTestId("spec-field-container:" + fieldName);
+      await container.locator("[data-wd-key='function-type'] select").selectOption(type);
+    },
+
+    /** Sets the "Base" input of a zoom/data function. */
+    setFunctionBase: async (fieldName: string, value: string) => {
+      const container = this.helper.get.elementByTestId("spec-field-container:" + fieldName);
+      await container.locator("[data-wd-key='function-base'] input").fill(value);
+    },
+
+    /**
+     * Sets the data property a data function keys off of. This is an InputString,
+     * which only commits its value on blur, so typing alone is not enough.
+     */
+    setFunctionProperty: async (fieldName: string, value: string) => {
+      const container = this.helper.get.elementByTestId("spec-field-container:" + fieldName);
+      const input = container.locator("[data-wd-key='function-property'] input");
+      await input.fill(value);
+      await input.blur();
+    },
+
+    /** Sets the fallback value used when a feature has no matching stop. */
+    setFunctionDefault: async (fieldName: string, value: string) => {
+      const container = this.helper.get.elementByTestId("spec-field-container:" + fieldName);
+      await container.locator("[data-wd-key='function-default'] input").fill(value);
+    },
+
+    /** Edits one cell of a function's stop table ("Zoom", "Input value" or "Output value"). */
+    setFunctionStopValue: async (fieldName: string, column: string, index: number, value: string) => {
+      const container = this.helper.get.elementByTestId("spec-field-container:" + fieldName);
+      await container.locator(`[aria-label="${column}"]`).nth(index).fill(value);
+    },
+
+    addFilter: async () => {
+      const button = this.helper.get.elementByTestId("layer-filter-button");
+      await button.scrollIntoViewIfNeeded();
+      await button.click({ force: true });
+    },
+
+    selectFilterOperator: async (value: string) => {
+      await this.helper.get.element(".maputnik-filter-editor-operator select").first().selectOption(value);
+    },
+
+    /** Chooses how the filter items combine: all / none / any. */
+    selectFilterCombiningOperator: async (value: string) => {
+      await this.helper.when.selectWithin("filter-combining-operator", value);
+    },
+
+    deleteFilterItem: async (index = 0) => {
+      await this.helper.get
+        .element(".maputnik-filter-editor-block-action .maputnik-icon-button")
+        .nth(index)
+        .click();
+    },
+
+    /** Converts the simple filter editor into a raw expression editor. */
+    convertFilterToExpression: async () => {
+      await this.helper.when.click("filter-convert-to-expression");
+    },
+
+    /**
+     * Deletes the filter expression, restoring the simple filter editor.
+     * The filter group precedes the paint group, so its button comes first.
+     */
+    deleteFilterExpression: async () => {
+      await this.helper.get.element("[data-wd-key='delete-expression']").first().click();
+    },
+
+    setColorValue: async (fieldName: string, value: string) => {
+      const input = this.helper.get.elementByTestId("spec-field:" + fieldName).locator(".maputnik-color");
+      await input.fill(value);
+    },
+
+    /** Sets a plain string spec field (e.g. a pattern), which has no dedicated input test id. */
+    setStringValue: async (fieldName: string, value: string) => {
+      const input = this.helper.get.elementByTestId("spec-field:" + fieldName).locator("input.maputnik-string");
+      await input.fill(value);
+      await input.blur();
+    },
+
+    /**
+     * Appends text to the end of the JSON editor line holding `lineText`.
+     * CodeMirror types over its own auto-inserted closing quotes/brackets, so a
+     * well-formed fragment stays well-formed.
+     */
+    appendToJsonEditorLine: async (lineText: string, text: string) => {
+      await this.helper.when.clickByText(lineText);
+      await this.helper.when.typeKeys("{end}");
+      await this.helper.when.typeText(text);
+    },
+
+    waitForExampleFileResponse: () => this.helper.when.waitForResponse("example-style.json"),
+
+    /** Fill localStorage until we get a QuotaExceededError. */
+    fillLocalStorage: () => this.helper.when.fillLocalStorageUntilQuota("maputnik:fill-"),
   };
 
   public get = {
     ...this.helper.get,
-    isMac: () => {
-      return Cypress.platform === "darwin";
-    },
 
-    styleFromLocalStorage: () =>
+    isMac: () => isMac,
-      this.helper.get.window().then((win) => styleFromWindow(win)),
 
-    exampleFileUrl: () => {
-      return baseUrl + "example-style.json";
-    },
-    skipTargetLayerList: () =>
-      this.helper.get.elementByTestId("skip-target-layer-list"),
-    skipTargetLayerEditor: () =>
-      this.helper.get.elementByTestId("skip-target-layer-editor"),
     canvas: () => this.helper.get.element("canvas"),
-    searchControl: () => this.helper.get.element(".maplibregl-ctrl-geocoder")
+
+    searchControl: () => this.helper.get.element(".maplibregl-ctrl-geocoder"),
+
+    skipTargetLayerList: () => this.helper.get.elementByTestId("skip-target-layer-list"),
+
+    skipTargetLayerEditor: () => this.helper.get.elementByTestId("skip-target-layer-editor"),
+
+    styleFromLocalStorage: () => this.helper.query(() => this.readStoredStyle()),
+
+    fixture: (name: string) => this.helper.readFixture(name),
+
+    responseBody: (alias: string) => {
+      // Our mocked style responses always return the matching fixture.
+      const name = alias.endsWith(".json") ? alias : `${alias}.json`;
+      return this.helper.readFixture(name);
+    },
+
+    exampleFileUrl: () => baseUrl + "example-style.json",
   };
 }

e2e/modal-driver.ts

@@ -1,40 +1,78 @@
 import { v1 as uuid } from "uuid";
-import MaputnikCypressHelper from "./maputnik-cypress-helper";
+import { PlaywrightHelper } from "./playwright-helper";
 
-export default class ModalDriver {
+export class ModalDriver {
-  private helper = new MaputnikCypressHelper();
+  private readonly helper = new PlaywrightHelper();
 
   public when = {
-    fillLayers: (opts: { type: string; layer?: string; id?: string }) => {
+    fillLayers: async (opts: { type: string; layer?: string; id?: string }) => {
-      // Having logic in test code is an anti pattern.
+      const { when, get, then } = this.helper;
-      // This should be split to multiple single responsibility functions
+      const id = opts.id ?? `${opts.type}:${uuid()}`;
-      const type = opts.type;
-      const layer = opts.layer;
-      let id;
-      if (opts.id) {
-        id = opts.id;
-      } else {
-        id = `${type}:${uuid()}`;
-      }
-      this.helper.when.selectOption("add-layer.layer-type.select", type);
-      this.helper.when.type("add-layer.layer-id.input", id);
 
-      if (layer) {
+      await when.select("add-layer.layer-type.select", opts.type);
-        this.helper.when.doWithin(() => {
+      await when.type("add-layer.layer-id.input", id);
-          this.helper.get.element("input").clear().type(layer!);
+
-        }, "add-layer.layer-source-block");
+      if (opts.layer) {
+        const input = get.elementByTestId("add-layer.layer-source-block").locator("input");
+        await input.click();
+        await input.fill(opts.layer);
+        // The source input is a controlled downshift combobox; wait for React to
+        // settle on the typed value before submitting.
+        await then(input).shouldHaveValue(opts.layer);
+        // Close the autocomplete menu so it does not intercept the add button.
+        await get.elementByTestId("add-layer.layer-id.input").click();
       }
-      this.helper.when.click("add-layer");
+      await when.click("add-layer");
 
       return id;
     },
 
-    open: () => {
+    open: async () => {
-      this.helper.when.click("layer-list:add-layer");
+      await this.helper.when.click("layer-list:add-layer");
     },
 
-    close: (key: string) => {
+    close: async (key: string) => {
-      this.helper.when.click(key + ".close-modal");
+      await this.helper.when.click(key + ".close-modal");
+    },
+
+    /**
+     * Adds a source of the given type from the sources modal, keeping whatever
+     * defaults that type's editor prefills.
+     */
+    addSource: async (sourceId: string, sourceType: string) => {
+      const { when } = this.helper;
+      await when.setValue("modal:sources.add.source_id", sourceId);
+      await when.select("modal:sources.add.source_type", sourceType);
+      await when.click("modal:sources.add.add_source");
+      await when.wait(200);
+    },
+
+    /** Adds one of the predefined public sources listed in the sources modal. */
+    addPublicSource: async (index = 0) => {
+      await this.helper.get.element(".maputnik-public-source-select").nth(index).click();
+    },
+
+    deleteFirstActiveSource: async () => {
+      await this.helper.get.element(".maputnik-active-source-type-editor-header-delete").first().click();
+    },
+
+    /** Fills one number box of a coordinate pair in the image/video source editor. */
+    setCoordinateValue: async (index: number, value: string) => {
+      const input = this.helper.get
+        .elementByTestId("modal:sources")
+        .locator(".maputnik-array input")
+        .nth(index);
+      await input.fill(value);
+      await input.blur();
+    },
+
+    exportCreateHtml: async () => {
+      await this.helper.get.element(".maputnik-modal-export-buttons button").last().click();
+    },
+
+    exportSaveStyle: async () => {
+      await this.helper.stubSaveFilePicker();
+      await this.helper.get.element(".maputnik-modal-export-buttons button").first().click();
     },
   };
 }

e2e/modals.spec.ts

@@ -1,103 +1,142 @@
+import { test, expect, describe, beforeEach } from "./utils/fixtures";
 import { MaputnikDriver } from "./maputnik-driver";
-import tokens from "../src/config/tokens.json" with {type: "json"};
+import tokens from "../src/config/tokens.json" with { type: "json" };
-const test = it;
 
 describe("modals", () => {
-  const { beforeAndAfter, when, get, given, then } = new MaputnikDriver();
+  const { given, get, when, then } = new MaputnikDriver();
-  beforeAndAfter();
 
-  beforeEach(() => {
+  beforeEach(async () => {
-    when.setStyle("");
+    await given.setupMockBackedResponses();
+    await when.setStyle("both");
+    await when.setStyle("");
   });
+
   describe("open", () => {
-    beforeEach(() => {
+    beforeEach(async () => {
-      when.click("nav:open");
+      await when.click("nav:open");
     });
 
-    test("close", () => {
+    test("close", async () => {
-      when.modal.close("modal:open");
+      await when.modal.close("modal:open");
-      then(get.elementByTestId("modal:open")).shouldNotExist();
+      await then(get.elementByTestId("modal:open")).shouldNotExist();
     });
 
-    test("upload", () => {
+    test("upload", async () => {
-      when.chooseExampleFile();
+      await when.chooseExampleFile();
-      then(get.fixture("example-style.json")).shouldEqualToStoredStyle();
+      await then(get.styleFromLocalStorage()).shouldDeepNestedInclude(get.fixture("example-style.json"));
     });
 
-    test("upload via drag and drop", () => {
+    test("upload via drag and drop", async () => {
-      when.dropExampleFile();
+      await when.dropExampleFile();
-      then(get.fixture("example-style.json")).shouldEqualToStoredStyle();
+      await then(get.styleFromLocalStorage()).shouldDeepNestedInclude(get.fixture("example-style.json"));
     });
 
     describe("when click open url", () => {
-      beforeEach(() => {
+      beforeEach(async () => {
         const styleFileUrl = get.exampleFileUrl();
 
-        when.setValue("modal:open.url.input", styleFileUrl);
+        await when.setValue("modal:open.url.input", styleFileUrl);
-        when.click("modal:open.url.button");
+        await when.click("modal:open.url.button");
-        when.wait(200);
+        await when.wait(200);
       });
-      test("load from url", () => {
+      test("load from url", async () => {
-        then(get.responseBody("example-style.json")).shouldEqualToStoredStyle();
+        await then(get.styleFromLocalStorage()).shouldDeepNestedInclude(get.responseBody("example-style.json"));
+      });
+    });
+
+    describe("without the File System Access API", () => {
+      test("upload via the file chooser", async () => {
+        await given.noFileSystemAccessApi();
+        await when.setStyle("");
+        await when.click("nav:open");
+        await when.chooseExampleFileFromPicker();
+        await then(get.styleFromLocalStorage()).shouldDeepNestedInclude(get.fixture("example-style.json"));
       });
     });
   });
 
   describe("shortcuts", () => {
-    test("open/close", () => {
+    test("open/close", async () => {
-      when.setStyle("");
+      await when.setStyle("");
-      when.typeKeys("?");
+      await when.typeKeys("?");
-      when.modal.close("modal:shortcuts");
+      await when.modal.close("modal:shortcuts");
-      then(get.elementByTestId("modal:shortcuts")).shouldNotExist();
+      await then(get.elementByTestId("modal:shortcuts")).shouldNotExist();
     });
   });
 
   describe("export", () => {
-    beforeEach(() => {
+    beforeEach(async () => {
-      when.click("nav:export");
+      await when.click("nav:export");
     });
 
-    test("close", () => {
+    test("close", async () => {
-      when.modal.close("modal:export");
+      await when.modal.close("modal:export");
-      then(get.elementByTestId("modal:export")).shouldNotExist();
+      await then(get.elementByTestId("modal:export")).shouldNotExist();
     });
 
-    // TODO: Work out how to download a file and check the contents
+    test("download HTML and save the style", async () => {
-    test("download");
+      // Generate the standalone HTML export (triggers a file download).
+      await when.modal.exportCreateHtml();
+      await then(get.elementByTestId("modal:export")).shouldExist();
+
+      // Saving the style closes the export modal.
+      await when.modal.exportSaveStyle();
+      await then(get.elementByTestId("modal:export")).shouldNotExist();
+    });
   });
 
   describe("sources", () => {
-    beforeEach(() => {
+    beforeEach(async () => {
-      when.setStyle("layer");
+      await when.setStyle("layer");
-      when.click("nav:sources");
+      await when.click("nav:sources");
     });
 
-    test("active sources");
+    test("active sources are listed and can be deleted", async () => {
-    test("public source");
+      await when.setStyle("both");
+      await when.click("nav:sources");
+      const before = Object.keys(get.fixture("geojson-raster-style.json").sources).length;
+      await when.modal.deleteFirstActiveSource();
+      await then(
+        get.styleFromLocalStorage().then((style) => Object.keys(style.sources).length)
+      ).shouldEqual(before - 1);
+    });
 
-    test("add new source", () => {
+    test("public source", async () => {
-      const sourceId = "n1z2v3r";
+      await when.modal.addPublicSource();
-      when.setValue("modal:sources.add.source_id", sourceId);
+      await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
-      when.select("modal:sources.add.source_type", "tile_vector");
+        sources: {
-      when.select("modal:sources.add.scheme_type", "tms");
+          openmaptiles: {
-      when.click("modal:sources.add.add_source");
+            type: "vector",
-      when.wait(200);
+            url: `https://api.maptiler.com/tiles/v3-openmaptiles/tiles.json?key=${tokens.openmaptiles}`,
-      then(
+          },
-        get.styleFromLocalStorage().then((style) => style.sources[sourceId])
+        },
-      ).shouldInclude({
-        scheme: "tms",
       });
     });
 
-    test("add new pmtiles source", () => {
+    test("add new source", async () => {
+      const sourceId = "n1z2v3r";
+      await when.setValue("modal:sources.add.source_id", sourceId);
+      await when.select("modal:sources.add.source_type", "tile_vector");
+      await when.select("modal:sources.add.scheme_type", "tms");
+      await when.click("modal:sources.add.add_source");
+      await when.wait(200);
+      await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
+        sources: { [sourceId]: { scheme: "tms" } },
+      });
+    });
+
+    test("add new pmtiles source", async () => {
       const sourceId = "pmtilestest";
-      when.setValue("modal:sources.add.source_id", sourceId);
+      await when.setValue("modal:sources.add.source_id", sourceId);
-      when.select("modal:sources.add.source_type", "pmtiles_vector");
+      await when.select("modal:sources.add.source_type", "pmtiles_vector");
-      when.setValue("modal:sources.add.source_url", "https://data.source.coop/protomaps/openstreetmap/v4.pmtiles");
+      await when.setValue(
-      when.click("modal:sources.add.add_source");
+        "modal:sources.add.source_url",
-      when.click("modal:sources.add.add_source");
+        "https://data.source.coop/protomaps/openstreetmap/v4.pmtiles"
-      when.wait(200);
+      );
-      then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
+      await when.click("modal:sources.add.add_source");
+      await when.click("modal:sources.add.add_source");
+      await when.wait(200);
+      await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
         sources: {
           pmtilestest: {
             type: "vector",
@@ -107,351 +146,432 @@ describe("modals", () => {
       });
     });
 
-    test("add new raster source", () => {
+    test("add new raster source", async () => {
       const sourceId = "rastertest";
-      when.setValue("modal:sources.add.source_id", sourceId);
+      await when.setValue("modal:sources.add.source_id", sourceId);
-      when.select("modal:sources.add.source_type", "tile_raster");
+      await when.select("modal:sources.add.source_type", "tile_raster");
-      when.select("modal:sources.add.scheme_type", "xyz");
+      await when.select("modal:sources.add.scheme_type", "xyz");
-      when.setValue("modal:sources.add.tile_size", "128");
+      await when.setValue("modal:sources.add.tile_size", "128");
-      when.click("modal:sources.add.add_source");
+      await when.click("modal:sources.add.add_source");
-      when.wait(200);
+      await when.wait(200);
-      then(
+      await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
-        get.styleFromLocalStorage().then((style) => style.sources[sourceId])
+        sources: { [sourceId]: { tileSize: 128 } },
-      ).shouldInclude({
+      });
-        tileSize: 128,
+    });
+
+    test("add new geojson url source", async () => {
+      await when.modal.addSource("geojsonurl", "geojson_url");
+      await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
+        sources: {
+          geojsonurl: { type: "geojson", data: "http://localhost:3000/geojson.json" },
+        },
+      });
+    });
+
+    test("add new geojson json source", async () => {
+      await when.modal.addSource("geojsonjson", "geojson_json");
+      await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
+        sources: {
+          geojsonjson: { type: "geojson", cluster: false, data: "" },
+        },
+      });
+    });
+
+    test("add new tilejson vector source", async () => {
+      await when.modal.addSource("tilejsonvector", "tilejson_vector");
+      await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
+        sources: {
+          tilejsonvector: { type: "vector", url: "http://localhost:3000/tilejson.json" },
+        },
+      });
+    });
+
+    test("add new tilejson raster source", async () => {
+      await when.modal.addSource("tilejsonraster", "tilejson_raster");
+      await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
+        sources: {
+          tilejsonraster: { type: "raster", url: "http://localhost:3000/tilejson.json" },
+        },
+      });
+    });
+
+    test("add new tilejson raster-dem source", async () => {
+      await when.modal.addSource("tilejsonrasterdem", "tilejson_raster-dem");
+      await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
+        sources: {
+          tilejsonrasterdem: { type: "raster-dem", url: "http://localhost:3000/tilejson.json" },
+        },
+      });
+    });
+
+    test("add new tile xyz raster-dem source", async () => {
+      await when.modal.addSource("tilexyzrasterdem", "tilexyz_raster-dem");
+      await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
+        sources: {
+          tilexyzrasterdem: {
+            type: "raster-dem",
+            tiles: ["http://localhost:3000/{x}/{y}/{z}.png"],
+            minzoom: 0,
+            maxzoom: 14,
+            tileSize: 512,
+          },
+        },
+      });
+    });
+
+    test("add new image source", async () => {
+      await when.modal.addSource("imagesource", "image");
+      await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
+        sources: {
+          imagesource: {
+            type: "image",
+            url: "http://localhost:3000/image.png",
+            coordinates: [[0, 0], [0, 0], [0, 0], [0, 0]],
+          },
+        },
+      });
+    });
+
+    test("add new video source", async () => {
+      await when.modal.addSource("videosource", "video");
+      await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
+        sources: {
+          videosource: {
+            type: "video",
+            urls: ["http://localhost:3000/movie.mp4"],
+            coordinates: [[0, 0], [0, 0], [0, 0], [0, 0]],
+          },
+        },
+      });
+    });
+
+    test("edit the corner coordinates of an image source", async () => {
+      const sourceId = "imagecoords";
+      await when.setValue("modal:sources.add.source_id", sourceId);
+      await when.select("modal:sources.add.source_type", "image");
+      // The first corner is the first two number boxes of the coordinate arrays.
+      await when.modal.setCoordinateValue(0, "1");
+      await when.modal.setCoordinateValue(1, "2");
+      await when.click("modal:sources.add.add_source");
+      await when.wait(200);
+      await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
+        sources: {
+          [sourceId]: { type: "image", coordinates: [[1, 2], [0, 0], [0, 0], [0, 0]] },
+        },
       });
     });
   });
 
   describe("inspect", () => {
-    test("toggle", () => {
+    test("toggle", async () => {
       // There is no assertion in this test
-      when.setStyle("geojson");
+      await when.setStyle("geojson");
-      when.select("maputnik-select", "inspect");
+      await when.select("maputnik-select", "inspect");
     });
   });
 
   describe("style settings", () => {
-    beforeEach(() => {
+    beforeEach(async () => {
-      when.click("nav:settings");
+      await when.click("nav:settings");
     });
 
     describe("when click name filed spec information", () => {
-      beforeEach(() => {
+      beforeEach(async () => {
-        when.click("field-doc-button-Name");
+        await when.click("field-doc-button-Name");
       });
 
-      test("should show the spec information", () => {
+      test("should show the spec information", async () => {
-        then(get.elementsText("spec-field-doc")).shouldInclude(
+        await then(get.elementsText("spec-field-doc")).shouldInclude("name for the style");
-          "name for the style"
-        );
       });
     });
 
     describe("when set name and click owner", () => {
-      beforeEach(() => {
+      beforeEach(async () => {
-        when.setValue("modal:settings.name", "foobar");
+        await when.setValue("modal:settings.name", "foobar");
-        when.click("modal:settings.owner");
+        await when.click("modal:settings.owner");
-        when.wait(200);
+        await when.wait(200);
       });
 
-      test("show name specifications", () => {
+      test("show name specifications", async () => {
-        then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
+        await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
           name: "foobar",
         });
       });
     });
 
     describe("when set owner and click name", () => {
-      beforeEach(() => {
+      beforeEach(async () => {
-        when.setValue("modal:settings.owner", "foobar");
+        await when.setValue("modal:settings.owner", "foobar");
-        when.click("modal:settings.name");
+        await when.click("modal:settings.name");
-        when.wait(200);
+        await when.wait(200);
       });
-      test("should update owner in local storage", () => {
+      test("should update owner in local storage", async () => {
-        then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
+        await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
           owner: "foobar",
         });
       });
     });
 
-    test("sprite url", () => {
+    test("sprite url", async () => {
-      when.setTextInJsonEditor("\"http://example.com\"");
+      await when.setTextInJsonEditor('"http://example.com"');
-      when.click("modal:settings.name");
+      await when.click("modal:settings.name");
-      then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
+      await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
         sprite: "http://example.com",
       });
     });
 
-    test("sprite object", () => {
+    test("sprite object", async () => {
-      when.setTextInJsonEditor(JSON.stringify([{ id: "1", url: "2" }]));
+      await when.setTextInJsonEditor(JSON.stringify([{ id: "1", url: "2" }]));
 
-      when.click("modal:settings.name");
+      await when.click("modal:settings.name");
-      then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
+      await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
         sprite: [{ id: "1", url: "2" }],
       });
     });
 
-    test("glyphs url", () => {
+    test("glyphs url", async () => {
       const glyphsUrl = "http://example.com/{fontstack}/{range}.pbf";
-      when.setValue("modal:settings.glyphs", glyphsUrl);
+      await when.setValue("modal:settings.glyphs", glyphsUrl);
-      when.click("modal:settings.name");
+      await when.click("modal:settings.name");
-      then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
+      await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
         glyphs: glyphsUrl,
       });
     });
 
-    test("maptiler access token", () => {
+    test("maptiler access token", async () => {
       const apiKey = "testing123";
-      when.setValue(
+      await when.setValue("modal:settings.maputnik:openmaptiles_access_token", apiKey);
-        "modal:settings.maputnik:openmaptiles_access_token",
+      await when.click("modal:settings.name");
-        apiKey
+      await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
-      );
+        metadata: { "maputnik:openmaptiles_access_token": apiKey },
-      when.click("modal:settings.name");
-      then(
-        get.styleFromLocalStorage().then((style) => style.metadata)
-      ).shouldInclude({
-        "maputnik:openmaptiles_access_token": apiKey,
       });
     });
 
-    test("thunderforest access token", () => {
+    test("thunderforest access token", async () => {
       const apiKey = "testing123";
-      when.setValue(
+      await when.setValue("modal:settings.maputnik:thunderforest_access_token", apiKey);
-        "modal:settings.maputnik:thunderforest_access_token",
+      await when.click("modal:settings.name");
-        apiKey
+      await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
-      );
+        metadata: { "maputnik:thunderforest_access_token": apiKey },
-      when.click("modal:settings.name");
+      });
-      then(
-        get.styleFromLocalStorage().then((style) => style.metadata)
-      ).shouldInclude({ "maputnik:thunderforest_access_token": apiKey });
     });
 
-    test("stadia access token", () => {
+    test("stadia access token", async () => {
       const apiKey = "testing123";
-      when.setValue(
+      await when.setValue("modal:settings.maputnik:stadia_access_token", apiKey);
-        "modal:settings.maputnik:stadia_access_token",
+      await when.click("modal:settings.name");
-        apiKey
+      await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
-      );
+        metadata: { "maputnik:stadia_access_token": apiKey },
-      when.click("modal:settings.name");
+      });
-      then(
-        get.styleFromLocalStorage().then((style) => style.metadata)
-      ).shouldInclude({ "maputnik:stadia_access_token": apiKey });
     });
 
-    test("locationiq access token", () => {
+    test("locationiq access token", async () => {
       const apiKey = "testing123";
-      when.setValue(
+      await when.setValue("modal:settings.maputnik:locationiq_access_token", apiKey);
-        "modal:settings.maputnik:locationiq_access_token",
+      await when.click("modal:settings.name");
-        apiKey
+      await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
-      );
+        metadata: { "maputnik:locationiq_access_token": apiKey },
-      when.click("modal:settings.name");
+      });
-      then(
-        get.styleFromLocalStorage().then((style) => style.metadata)
-      ).shouldInclude({ "maputnik:locationiq_access_token": apiKey });
     });
 
-    test("style projection mercator", () => {
+    test("map view defaults", async () => {
-      when.select("modal:settings.projection", "mercator");
+      await when.setValue("modal:settings.zoom", "4");
-      then(
+      await when.setValue("modal:settings.bearing", "12");
-        get.styleFromLocalStorage().then((style) => style.projection)
+      await when.setValue("modal:settings.pitch", "30");
-      ).shouldInclude({ type: "mercator" });
+      await when.click("modal:settings.name");
+      await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
+        zoom: 4,
+        bearing: 12,
+        pitch: 30,
+      });
     });
 
-    test("style projection globe", () => {
+    test("light intensity", async () => {
-      when.select("modal:settings.projection", "globe");
+      await when.setValue("modal:settings.light-intensity", "0.7");
-      then(
+      await when.click("modal:settings.name");
-        get.styleFromLocalStorage().then((style) => style.projection)
+      await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
-      ).shouldInclude({ type: "globe" });
+        light: { intensity: 0.7 },
+      });
     });
 
-
+    test("terrain source and exaggeration", async () => {
-    test("style projection vertical-perspective", () => {
+      await when.setValue("modal:settings.maputnik:terrain_source", "terrain");
-      when.select("modal:settings.projection", "vertical-perspective");
+      await when.setValue("modal:settings.terrain-exaggeration", "1.5");
-      then(
+      await when.click("modal:settings.name");
-        get.styleFromLocalStorage().then((style) => style.projection)
+      await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
-      ).shouldInclude({ type: "vertical-perspective" });
+        terrain: { source: "terrain", exaggeration: 1.5 },
-
+      });
     });
 
-    test("style renderer", () => {
+    test("transition delay and duration", async () => {
-      cy.on("uncaught:exception", () => false); // this is due to the fact that this is an invalid style for openlayers
+      await when.setValue("modal:settings.transition-delay", "100");
-      when.select("modal:settings.maputnik:renderer", "ol");
+      await when.setValue("modal:settings.transition-duration", "500");
-      then(get.inputValue("modal:settings.maputnik:renderer")).shouldEqual(
+      await when.click("modal:settings.name");
-        "ol"
+      await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
-      );
+        transition: { delay: 100, duration: 500 },
+      });
+    });
 
-      when.click("modal:settings.name");
+    test("style projection mercator", async () => {
-      then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
+      await when.select("modal:settings.projection", "mercator");
+      await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
+        projection: { type: "mercator" },
+      });
+    });
+
+    test("style projection globe", async () => {
+      await when.select("modal:settings.projection", "globe");
+      await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
+        projection: { type: "globe" },
+      });
+    });
+
+    test("style projection vertical-perspective", async () => {
+      await when.select("modal:settings.projection", "vertical-perspective");
+      await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
+        projection: { type: "vertical-perspective" },
+      });
+    });
+
+    test("style renderer", async () => {
+      await when.select("modal:settings.maputnik:renderer", "ol");
+      await then(get.inputValue("modal:settings.maputnik:renderer")).shouldEqual("ol");
+
+      await when.click("modal:settings.name");
+      await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
         metadata: { "maputnik:renderer": "ol" },
       });
     });
 
+    test("include API key when change renderer", async () => {
+      await when.click("modal:settings.close-modal");
+      await when.click("nav:open");
 
+      await when.clickByAttribute("aria-label", "MapTiler Basic");
+      await when.wait(1000);
+      await when.click("nav:settings");
 
-    test("include API key when change renderer", () => {
+      await when.select("modal:settings.maputnik:renderer", "mlgljs");
+      await then(get.inputValue("modal:settings.maputnik:renderer")).shouldEqual("mlgljs");
 
-      when.click("modal:settings.close-modal");
+      await when.select("modal:settings.maputnik:renderer", "ol");
-      when.click("nav:open");
+      await then(get.inputValue("modal:settings.maputnik:renderer")).shouldEqual("ol");
 
-      get.elementByAttribute("aria-label", "MapTiler Basic").should("exist").click();
+      await given.intercept(
-      when.wait(1000);
+        /https:\/\/api\.maptiler\.com\/tiles\/v3-openmaptiles\/tiles\.json\?key=.*/,
-      when.click("nav:settings");
+        "tileRequest",
-
+        "GET"
-      when.select("modal:settings.maputnik:renderer", "mlgljs");
-      then(get.inputValue("modal:settings.maputnik:renderer")).shouldEqual(
-        "mlgljs"
       );
 
-      when.select("modal:settings.maputnik:renderer", "ol");
+      await when.select("modal:settings.maputnik:renderer", "mlgljs");
-      then(get.inputValue("modal:settings.maputnik:renderer")).shouldEqual(
+      await then(get.inputValue("modal:settings.maputnik:renderer")).shouldEqual("mlgljs");
-        "ol"
+
+      const request = await when.waitForResponse("tileRequest");
+      expect(request.url()).toContain(
+        `https://api.maptiler.com/tiles/v3-openmaptiles/tiles.json?key=${tokens.openmaptiles}`
       );
-
-      given.intercept("https://api.maptiler.com/tiles/v3-openmaptiles/tiles.json?key=*", "tileRequest", "GET");
-
-      when.select("modal:settings.maputnik:renderer", "mlgljs");
-      then(get.inputValue("modal:settings.maputnik:renderer")).shouldEqual(
-        "mlgljs"
-      );
-
-      when.waitForResponse("tileRequest").its("request").its("url").should("include", `https://api.maptiler.com/tiles/v3-openmaptiles/tiles.json?key=${tokens.openmaptiles}`);
-      when.waitForResponse("tileRequest").its("request").its("url").should("include", `https://api.maptiler.com/tiles/v3-openmaptiles/tiles.json?key=${tokens.openmaptiles}`);
-      when.waitForResponse("tileRequest").its("request").its("url").should("include", `https://api.maptiler.com/tiles/v3-openmaptiles/tiles.json?key=${tokens.openmaptiles}`);
     });
-
   });
 
   describe("add layer", () => {
-    beforeEach(() => {
+    beforeEach(async () => {
-      when.setStyle("layer");
+      await when.setStyle("layer");
-      when.modal.open();
+      await when.modal.open();
     });
 
-    test("shows duplicate id error", () => {
+    test("shows duplicate id error", async () => {
-      when.setValue("add-layer.layer-id.input", "background");
+      await when.setValue("add-layer.layer-id.input", "background");
-      when.click("add-layer");
+      await when.click("add-layer");
-      then(get.elementByTestId("modal:add-layer")).shouldExist();
+      await then(get.elementByTestId("modal:add-layer")).shouldExist();
-      then(get.element(".maputnik-modal-error")).shouldContainText(
+      await then(get.element(".maputnik-modal-error")).shouldContainText("Layer ID already exists");
-        "Layer ID already exists"
-      );
     });
   });
 
-  describe("sources", () => {
-    test("toggle");
-  });
-
   describe("global state", () => {
-    beforeEach(() => {
+    beforeEach(async () => {
-      when.click("nav:global-state");
+      await when.click("nav:global-state");
     });
 
-    test("add variable", () => {
+    test("add variable", async () => {
-      when.wait(100);
+      await when.wait(100);
-      when.click("global-state-add-variable");
+      await when.click("global-state-add-variable");
-      then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
+      await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
         state: { key1: { default: "value" } },
       });
     });
 
-
+    test("add multiple variables", async () => {
-    test("add multiple variables", () => {
+      await when.click("global-state-add-variable");
-      when.click("global-state-add-variable");
+      await when.click("global-state-add-variable");
-      when.click("global-state-add-variable");
+      await when.click("global-state-add-variable");
-      when.click("global-state-add-variable");
+      await when.wait(100);
-      when.wait(100);
+      await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
-      then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
         state: { key1: { default: "value" }, key2: { default: "value" }, key3: { default: "value" } },
       });
     });
 
-    test("remove variable", () => {
+    test("remove variable", async () => {
-      when.click("global-state-add-variable");
+      await when.click("global-state-add-variable");
-      when.click("global-state-add-variable");
+      await when.click("global-state-add-variable");
-      when.click("global-state-add-variable");
+      await when.click("global-state-add-variable");
-      when.click("global-state-remove-variable", 0);
+      await when.click("global-state-remove-variable", 0);
-      when.wait(100);
+      await when.wait(100);
-      then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
+      await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
         state: { key2: { default: "value" }, key3: { default: "value" } },
       });
     });
 
-    test("edit variable key", () => {
+    test("edit variable key", async () => {
-      when.click("global-state-add-variable");
+      await when.click("global-state-add-variable");
-      when.wait(100);
+      await when.wait(100);
-      when.setValue("global-state-variable-key:0", "mykey");
+      await when.setValue("global-state-variable-key:0", "mykey");
-      when.typeKeys("{enter}");
+      await when.typeKeys("{enter}");
-      when.wait(100);
+      await when.wait(100);
-      then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
+      await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
         state: { mykey: { default: "value" } },
       });
     });
 
-    test("edit variable value", () => {
+    test("edit variable value", async () => {
-      when.click("global-state-add-variable");
+      await when.click("global-state-add-variable");
-      when.wait(100);
+      await when.wait(100);
-      when.setValue("global-state-variable-value:0", "myvalue");
+      await when.setValue("global-state-variable-value:0", "myvalue");
-      when.typeKeys("{enter}");
+      await when.typeKeys("{enter}");
-      when.wait(100);
+      await when.wait(100);
-      then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
+      await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
         state: { key1: { default: "myvalue" } },
       });
     });
   });
 
   describe("error panel", () => {
-    test("not visible when no errors", () => {
+    test("not visible when no errors", async () => {
-      then(get.element("maputnik-message-panel-error")).shouldNotExist();
+      await then(get.element("maputnik-message-panel-error")).shouldNotExist();
     });
 
-    test("visible on style error", () => {
+    test("visible on style error", async () => {
-      when.modal.open();
+      await when.modal.open();
-      when.modal.fillLayers({
+      await when.modal.fillLayers({
         type: "circle",
         layer: "invalid",
       });
-      then(get.element(".maputnik-message-panel-error")).shouldBeVisible();
+      await then(get.element(".maputnik-message-panel-error")).shouldBeVisible();
     });
   });
 
   describe("Handle localStorage QuotaExceededError", () => {
-    test("handles quota exceeded error when opening style from URL", () => {
+    test("handles quota exceeded error when opening style from URL", async () => {
       // Clear localStorage to start fresh
-      cy.clearLocalStorage();
+      await when.clearLocalStorage();
-
+      await when.fillLocalStorage();
-      // fill localStorage until we get a QuotaExceededError
-      cy.window().then(win => {
-        let chunkSize = 1000;
-        const chunk = new Array(chunkSize).join("x");
-        let index = 0;
-
-        // Keep adding until we hit the quota
-        while (true) {
-          try {
-            const key = `maputnik:fill-${index++}`;
-            win.localStorage.setItem(key, chunk);
-          } catch (e: any) {
-            // Verify it's a quota error
-            if (e.name === "QuotaExceededError") {
-              if (chunkSize <= 1) return;
-              else {
-                chunkSize /= 2;
-                continue;
-              }
-            }
-            throw e; // Unexpected error
-          }
-        }
-      });
 
       // Open the style via URL input
-      when.click("nav:open");
+      await when.click("nav:open");
-      when.setValue("modal:open.url.input", get.exampleFileUrl());
+      await when.setValue("modal:open.url.input", get.exampleFileUrl());
-      when.click("modal:open.url.button");
+      await when.click("modal:open.url.button");
 
-      then(get.responseBody("example-style.json")).shouldEqualToStoredStyle();
+      await then(get.styleFromLocalStorage()).shouldDeepNestedInclude(get.responseBody("example-style.json"));
-      then(get.styleFromLocalStorage()).shouldExist();
+      await then(get.styleFromLocalStorage()).shouldExist();
     });
   });
 });

e2e/playwright-helper.ts

@@ -0,0 +1,453 @@
+import fs from "node:fs";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+import { expect, type Locator, type Page, type Request } from "@playwright/test";
+import { currentPage, recordCoverageChunk } from "./utils/fixtures";
+
+const DATA_ATTRIBUTE = "data-wd-key";
+const FIXTURES_DIR = path.join(path.dirname(fileURLToPath(import.meta.url)), "fixtures");
+const isMac = process.platform === "darwin";
+
+function testIdSelector(testId: string): string {
+  return `[${DATA_ATTRIBUTE}="${testId}"]`;
+}
+
+/** Retries `assertion` until it stops throwing */
+async function retry(
+  assertion: () => Promise<void> | void,
+  timeout = 10000,
+  interval = 100
+): Promise<void> {
+  const start = Date.now();
+  let lastError: unknown;
+  while (true) {
+    try {
+      await assertion();
+      return;
+    } catch (error) {
+      lastError = error;
+      if (Date.now() - start > timeout) throw lastError;
+      await new Promise((resolve) => setTimeout(resolve, interval));
+    }
+  }
+}
+
+/**
+ * A lazily-evaluated value (e.g. the style in localStorage). Assertions on a
+ * Query re-read the value until they pass.
+ */
+class Query<T> {
+  readonly __query = true as const;
+  constructor(private readonly getter: () => Promise<T>) {}
+
+  get(): Promise<T> {
+    return this.getter();
+  }
+
+  then<U>(mapper: (value: T) => U | Promise<U>): Query<U> {
+    return new Query<U>(async () => mapper(await this.getter()));
+  }
+}
+
+function isQuery(target: unknown): target is Query<unknown> {
+  return typeof target === "object" && target !== null && (target as Query<unknown>).__query === true;
+}
+
+function isLocator(target: unknown): target is Locator {
+  return (
+    typeof target === "object" &&
+    target !== null &&
+    typeof (target as Locator).count === "function" &&
+    typeof (target as Locator).boundingBox === "function"
+  );
+}
+
+/**
+ * Asserts that `actual` recursively contains everything in `expected`: nested
+ * objects are matched as subsets, while arrays and primitives must match exactly.
+ */
+function assertDeepNestedInclude(actual: any, expected: Record<string, unknown> | unknown[]): void {
+  expect(actual).toMatchObject(expected);
+}
+
+/**
+ * Fluent, auto-retrying assertions over a Playwright Locator or a lazily
+ * evaluated value/Query. This is the generic base that the maputnik-specific
+ * assertable extends.
+ */
+export class Assertable<T> {
+  constructor(private readonly target: T) {}
+
+  private locator(): Locator {
+    if (!isLocator(this.target)) throw new Error("Expected a Locator target for this assertion");
+    return this.target;
+  }
+
+  protected async assertValue(assertion: (value: any) => void): Promise<void> {
+    const target = this.target;
+    if (isQuery(target)) {
+      await retry(async () => assertion(await target.get()));
+    } else {
+      assertion(await (target as any));
+    }
+  }
+
+  // Element assertions (auto-retrying via Playwright web-first assertions).
+  shouldBeVisible = () => expect(this.locator().first()).toBeVisible();
+  // Some testids resolve to many elements that are always rendered but hidden
+  // (e.g. per-field documentation panels); "not visible" means none is visible.
+  shouldNotBeVisible = () => expect(this.locator().filter({ visible: true })).toHaveCount(0);
+  shouldExist = async () => {
+    if (isLocator(this.target)) {
+      await expect(this.locator().first()).toBeAttached();
+    } else {
+      await this.assertValue((value) => expect(value).toBeTruthy());
+    }
+  };
+  shouldNotExist = () => expect(this.locator()).toHaveCount(0);
+  shouldBeFocused = () => expect(this.locator().first()).toBeFocused();
+  shouldNotBeFocused = () => expect(this.locator().first()).not.toBeFocused();
+  shouldHaveValue = (value: string) => expect(this.locator().first()).toHaveValue(value);
+  shouldContainText = async (text: string) => {
+    const locator = this.locator();
+    // Prefer the visible element when a testid resolves to several (only the
+    // open documentation panel is visible; the rest are hidden in the DOM).
+    const target = (await locator.count()) > 1 ? locator.filter({ visible: true }).first() : locator.first();
+    await expect(target).toContainText(text);
+  };
+  shouldHaveText = (text: string) => expect(this.locator().first()).toHaveText(text);
+  shouldHaveLength = (length: number) => expect(this.locator()).toHaveCount(length);
+  shouldHaveCss = (property: string, value: string) => expect(this.locator().first()).toHaveCSS(property, value);
+
+  // Value assertions (auto-retrying for Query targets).
+  shouldEqual = (value: any) => this.assertValue((actual) => expect(actual).toBe(value));
+
+  shouldInclude = (value: any) =>
+    this.assertValue((actual) => {
+      if (typeof value === "object" && value !== null) {
+        expect(actual).toMatchObject(value);
+      } else {
+        expect(String(actual)).toContain(String(value));
+      }
+    });
+
+  shouldDeepNestedInclude = (value: Record<string, unknown> | unknown[]) =>
+    this.assertValue((actual) => assertDeepNestedInclude(actual, value));
+}
+
+async function typeSequence(page: Page, text: string): Promise<void> {
+  const tokens = text.match(/\{[^}]+\}|[^{]+/g) ?? [];
+  const modifierMap: Record<string, string> = { meta: "Meta", ctrl: "Control", shift: "Shift", alt: "Alt" };
+  const namedKeys: Record<string, string> = {
+    esc: "Escape",
+    enter: "Enter",
+    backspace: "Backspace",
+    del: "Delete",
+    tab: "Tab",
+    home: "Home",
+    end: "End",
+    rightarrow: "ArrowRight",
+  };
+
+  for (let i = 0; i < tokens.length; i++) {
+    const token = tokens[i];
+    if (!token.startsWith("{") || !token.endsWith("}")) {
+      await page.keyboard.type(token);
+      continue;
+    }
+    const name = token.slice(1, -1).toLowerCase();
+    if (name === "selectall") {
+      await page.keyboard.press(isMac ? "Meta+a" : "Control+a");
+    } else if (namedKeys[name]) {
+      await page.keyboard.press(namedKeys[name]);
+    } else if (modifierMap[name]) {
+      const modifiers = [modifierMap[name]];
+      let j = i + 1;
+      while (j < tokens.length && /^\{(meta|ctrl|shift|alt)\}$/i.test(tokens[j])) {
+        modifiers.push(modifierMap[tokens[j].slice(1, -1).toLowerCase()]);
+        j++;
+      }
+      const key = tokens[j] ?? "";
+      await page.keyboard.press([...modifiers, key].join("+"));
+      i = j;
+    }
+  }
+}
+
+async function centerOf(locator: Locator): Promise<{ x: number; y: number }> {
+  const box = await locator.boundingBox();
+  if (!box) throw new Error("Element has no bounding box");
+  return { x: box.x + box.width / 2, y: box.y + box.height / 2 };
+}
+
+/**
+ * This is where all plywright-specific test helpers live.
+ * It is used by the MaputnikDriver to implement the Maputnik-specific test helpers.
+ */
+export class PlaywrightHelper {
+  private readonly recordedRequests = new Map<string, Request[]>();
+
+  private get page(): Page {
+    return currentPage();
+  }
+
+  private testId(testId: string): Locator {
+    return this.page.locator(testIdSelector(testId));
+  }
+
+  /** Reads and parses a JSON fixture from the fixtures directory. */
+  public readFixture(name: string): any {
+    return JSON.parse(fs.readFileSync(path.join(FIXTURES_DIR, name), "utf-8"));
+  }
+
+  /** Wraps a lazily-evaluated value so assertions on it auto-retry. */
+  public query<T>(getter: () => Promise<T>): Query<T> {
+    return new Query<T>(getter);
+  }
+
+  /** Stubs the File System Access "save" picker so file saves complete headlessly. */
+  public stubSaveFilePicker(): Promise<void> {
+    return this.page.evaluate(() => {
+      (window as any).showSaveFilePicker = async () => ({
+        createWritable: async () => ({ write: async () => {}, close: async () => {} }),
+      });
+    });
+  }
+
+  /** Entry point for fluent assertions over a Locator or a value/Query. */
+  public then = <T>(target: T): Assertable<T> => new Assertable(target);
+
+  public given = {
+    /**
+     * Removes the File System Access API so the app falls back to a plain
+     * <input type="file">, the way Firefox and Safari behave. Must be called
+     * before the page under test is loaded.
+     */
+    noFileSystemAccessApi: async () => {
+      await this.page.addInitScript(() => {
+        delete (window as any).showOpenFilePicker;
+        delete (window as any).showSaveFilePicker;
+      });
+    },
+
+    intercept: async (pattern: RegExp, alias: string, _method = "GET") => {
+      this.recordedRequests.set(alias, []);
+      await this.page.route(pattern, (route) => {
+        this.recordedRequests.get(alias)!.push(route.request());
+        route.continue();
+      });
+    },
+
+    interceptAndMockResponse: async (options: {
+      method?: string;
+      url: string | RegExp;
+      response: unknown | { fixture: string };
+      alias?: string;
+    }) => {
+      const { url, response, alias } = options;
+      if (alias) this.recordedRequests.set(alias, []);
+      await this.page.route(url, (route) => {
+        if (alias) this.recordedRequests.get(alias)!.push(route.request());
+        const body =
+          response && typeof response === "object" && "fixture" in (response as any)
+            ? this.readFixture((response as { fixture: string }).fixture)
+            : response;
+        route.fulfill({ json: body });
+      });
+    },
+  };
+
+  public when = {
+    visit: async (url: string) => {
+      // Snapshot coverage before navigating, since a full page load resets it.
+      await recordCoverageChunk(this.page);
+      await this.page.goto(url);
+    },
+
+    wait: (ms: number) => this.page.waitForTimeout(ms),
+
+    tab: () => this.page.keyboard.press("Tab"),
+
+    typeKeys: (keys: string) => typeSequence(this.page, keys),
+
+    /** Types raw text into the focused element (no "{key}" sequence parsing). */
+    typeText: (text: string) => this.page.keyboard.type(text),
+
+    clickButtonByName: async (name: string) => {
+      await this.page.getByRole("button", { name }).click();
+    },
+
+    click: async (testId: string, index = 0) => {
+      // Documentation buttons are wrapped in a <label>/.maputnik-doc-target that
+      // Playwright treats as intercepting the click; bypass the check for them.
+      const force = testId.startsWith("field-doc-button-");
+      await this.testId(testId).nth(index).click({ force });
+    },
+
+    realClick: async (testId: string) => {
+      await this.testId(testId).click();
+    },
+
+    hover: async (testId: string) => {
+      await this.testId(testId).hover();
+    },
+
+    focus: async (testId: string) => {
+      await this.testId(testId).focus();
+    },
+
+    clear: async (testId: string) => {
+      await this.testId(testId).clear();
+    },
+
+    select: async (testId: string, value: string) => {
+      await this.testId(testId).selectOption(value);
+    },
+
+    selectWithin: async (parentTestId: string, value: string) => {
+      await this.testId(parentTestId).locator("select").selectOption(value);
+    },
+
+    clickWithin: async (parentTestId: string, selector: string) => {
+      await this.testId(parentTestId).locator(selector).first().click();
+    },
+
+    clickByText: async (text: string) => {
+      await this.page.getByText(text).click();
+    },
+
+    clickByAttribute: async (attribute: string, value: string) => {
+      await this.page.locator(`[${attribute}="${value}"]`).click();
+    },
+
+    scrollToBottom: async (element: Locator) => {
+      await element.evaluate((el) => el.scrollTo(0, el.scrollHeight));
+    },
+
+    setValue: async (testId: string, text: string) => {
+      const input = this.testId(testId);
+      await input.fill("");
+      await input.fill(text);
+    },
+
+    type: async (testId: string, text: string) => {
+      await this.testId(testId).focus();
+      // Place the caret at the start of the field, so a leading "{backspace}"
+      // is a no-op rather than clearing an already-committed value.
+      await this.page.keyboard.press("Home");
+      await typeSequence(this.page, text);
+    },
+
+    dragAndDropWithWait: async (source: string, target: string) => {
+      const from = await centerOf(this.testId(source));
+      const to = await centerOf(this.testId(target));
+      await this.page.mouse.move(from.x, from.y);
+      await this.page.mouse.down();
+      await this.page.mouse.move(from.x, from.y + 10);
+      await this.page.mouse.move(to.x, to.y, { steps: 10 });
+      await this.page.waitForTimeout(100);
+      await this.page.mouse.up();
+    },
+
+    clickCenter: async (testId: string) => {
+      const { x, y } = await centerOf(this.testId(testId));
+      await this.page.mouse.move(x, y);
+      await this.page.mouse.down();
+      await this.page.waitForTimeout(200);
+      await this.page.mouse.up();
+    },
+
+    /**
+     * Opens a fixture through the File System Access API, which raises no
+     * "filechooser" event and so has to be stubbed. For the <input type="file">
+     * fallback that browsers without the API use, see chooseFileFromPicker.
+     */
+    openFileByFixture: async (fixture: string, buttonTestId: string) => {
+      const content = JSON.stringify(this.readFixture(fixture));
+      await this.page.evaluate((fileContent) => {
+        (window as any).showOpenFilePicker = async () => [
+          { getFile: async () => ({ text: async () => fileContent }) },
+        ];
+      }, content);
+      await this.testId(buttonTestId).click();
+    },
+
+    /**
+     * Clicks a control that opens the browser's native file chooser and answers
+     * it with a fixture. Only works on the <input type="file"> path — the File
+     * System Access API does not raise a "filechooser" event, so pair this with
+     * given.noFileSystemAccessApi().
+     */
+    chooseFileFromPicker: async (fixture: string, triggerTestId: string) => {
+      const content = JSON.stringify(this.readFixture(fixture));
+      const [fileChooser] = await Promise.all([
+        this.page.waitForEvent("filechooser"),
+        this.testId(triggerTestId).click(),
+      ]);
+      await fileChooser.setFiles({
+        name: fixture,
+        mimeType: "application/json",
+        buffer: Buffer.from(content),
+      });
+    },
+
+    dropFileByFixture: async (fixture: string, dropzoneTestId: string) => {
+      const content = JSON.stringify(this.readFixture(fixture));
+      const dataTransfer = await this.page.evaluateHandle((fileContent) => {
+        const dt = new DataTransfer();
+        dt.items.add(new File([fileContent], "example-style.json", { type: "application/json" }));
+        return dt;
+      }, content);
+      const dropzone = this.testId(dropzoneTestId);
+      await dropzone.dispatchEvent("dragenter", { dataTransfer });
+      await dropzone.dispatchEvent("dragover", { dataTransfer });
+      await dropzone.dispatchEvent("drop", { dataTransfer });
+    },
+
+    waitForResponse: async (alias: string) => {
+      const requests = this.recordedRequests.get(alias);
+      if (!requests) throw new Error(`No intercept registered for alias "${alias}"`);
+      await retry(async () => {
+        if (requests.length === 0) throw new Error(`No request recorded for alias "${alias}"`);
+      });
+      return requests[requests.length - 1];
+    },
+
+    clearLocalStorage: () => this.page.evaluate(() => window.localStorage.clear()),
+
+    /** Writes to localStorage under `keyPrefix` until a QuotaExceededError is hit. */
+    fillLocalStorageUntilQuota: (keyPrefix: string) =>
+      this.page.evaluate((prefix) => {
+        let chunkSize = 1000;
+        const chunk = new Array(chunkSize).join("x");
+        let index = 0;
+        while (true) {
+          try {
+            window.localStorage.setItem(`${prefix}${index++}`, chunk);
+          } catch (e: any) {
+            if (e.name === "QuotaExceededError") {
+              if (chunkSize <= 1) return;
+              chunkSize /= 2;
+              continue;
+            }
+            throw e; // Unexpected error
+          }
+        }
+      }, keyPrefix),
+  };
+
+  public get = {
+    element: (selector: string) => this.page.locator(selector),
+
+    localStorageItem: (key: string) =>
+      this.page.evaluate((k) => window.localStorage.getItem(k), key),
+
+    elementByTestId: (testId: string) => this.testId(testId),
+
+    inputValue: (testId: string) => new Query<string>(() => this.testId(testId).first().inputValue()),
+
+    elementsText: (testId: string) => new Query<string>(() => this.testId(testId).first().innerText()),
+
+    locationHash: () => new Query<string>(async () => new URL(this.page.url()).hash),
+  };
+}

e2e/utils/e2e-setup.ts

@@ -0,0 +1,12 @@
+import fs from "node:fs";
+import path from "node:path";
+
+/**
+ * Clears the istanbul coverage output directory before the e2e run so stale
+ * coverage from previous runs is not merged into the report.
+ */
+export default function globalSetup(): void {
+  const dir = path.resolve(process.cwd(), ".nyc_output");
+  fs.rmSync(dir, { recursive: true, force: true });
+  fs.mkdirSync(dir, { recursive: true });
+}

e2e/utils/e2e-teardown.ts

@@ -0,0 +1,23 @@
+import fs from "node:fs";
+import path from "node:path";
+import { execFileSync } from "node:child_process";
+
+/**
+ * Merges the per-test istanbul coverage chunks collected in `.nyc_output` into a
+ * report (configured by `.nycrc.json`) once the whole e2e run has finished.
+ */
+export default function globalTeardown(): void {
+  const dir = path.resolve(process.cwd(), ".nyc_output");
+  const hasCoverage = fs.existsSync(dir) && fs.readdirSync(dir).some((f) => f.endsWith(".json"));
+  if (!hasCoverage) {
+    console.warn("No coverage data collected; skipping coverage report.");
+    return;
+  }
+  try {
+    execFileSync("npx", ["nyc", "report"], { stdio: "inherit" });
+  } catch (error) {
+    // Don't fail the whole run if the report can't be generated (e.g. when
+    // running against a container whose source paths differ from the host).
+    console.warn("Failed to generate coverage report:", error);
+  }
+}

e2e/utils/fixtures.ts

@@ -0,0 +1,82 @@
+import { test, expect, type Page } from "@playwright/test";
+import fs from "node:fs";
+import path from "node:path";
+
+let activePage: Page | undefined;
+const coverageChunks: unknown[] = [];
+
+/** The page for the currently running test. Throws if used outside a test. */
+export function currentPage(): Page {
+  if (!activePage) {
+    throw new Error("No active page: a MaputnikDriver method was called outside of a running test.");
+  }
+  return activePage;
+}
+
+const OUTPUT_DIR = path.resolve(process.cwd(), ".nyc_output");
+
+/**
+ * Reads the istanbul coverage object (injected by vite-plugin-istanbul) from the
+ * given page. Returns `null` when the page has not been instrumented.
+ */
+async function readCoverage(page: Page): Promise<unknown | null> {
+  try {
+    return await page.evaluate(() => (window as unknown as { __coverage__?: unknown }).__coverage__ ?? null);
+  } catch {
+    // Page might be navigating/closed.
+    return null;
+  }
+}
+
+/**
+ * Persists a coverage chunk to `.nyc_output` so that `nyc report` can merge it.
+ * istanbul-lib-coverage (used by nyc) sums the hit counts across every file it
+ * finds, so writing one file per chunk is enough to accumulate coverage across
+ * navigations and tests.
+ */
+export function writeCoverage(coverage: unknown, id: string): void {
+  if (!coverage) return;
+  fs.mkdirSync(OUTPUT_DIR, { recursive: true });
+  fs.writeFileSync(path.join(OUTPUT_DIR, `playwright-${id}.json`), JSON.stringify(coverage));
+}
+
+/** Records a coverage snapshot (called before navigations, which reset __coverage__). */
+export async function recordCoverageChunk(page: Page): Promise<void> {
+  const chunk = await readCoverage(page);
+  if (chunk) coverageChunks.push(chunk);
+}
+
+/**
+ * Auto fixture that binds the current test's page for the (page-lazy)
+ * MaputnikDriver, auto-accepts confirm dialogs, and writes the istanbul
+ * coverage collected during the test to `.nyc_output`.
+ */
+const extendedTest = test.extend<{ maputnikPage: void }>({
+  maputnikPage: [
+    async ({ page }, use, testInfo) => {
+      activePage = page;
+      coverageChunks.length = 0;
+      // Accept confirm dialogs (e.g. the "replace current style" prompt). These
+      // are dismissed by default, which would cancel loading a style via URL.
+      page.on("dialog", (dialog) => dialog.accept().catch(() => undefined));
+
+      await use();
+
+      const finalCoverage = await readCoverage(page);
+      if (finalCoverage) coverageChunks.push(finalCoverage);
+      coverageChunks.forEach((chunk, index) => writeCoverage(chunk, `${testInfo.testId}-${index}`));
+      coverageChunks.length = 0;
+      activePage = undefined;
+    },
+    { auto: true },
+  ],
+});
+
+const describe = extendedTest.describe;
+const beforeEach = extendedTest.beforeEach;
+export {
+  expect,
+  describe,
+  extendedTest as test,
+  beforeEach,
+};

eslint.config.js

@@ -34,7 +34,9 @@ export default defineConfig({
   rules: {
     "react-refresh/only-export-components": [
       "warn",
-      { allowConstantExport: true }
+      // Many components are exported as withTranslation()(Component); without
+      // this the rule cannot tell the HOC's result is still a component.
+      { allowConstantExport: true, extraHOCs: ["withTranslation"] }
     ],
     "@typescript-eslint/no-explicit-any": "off",
     "@typescript-eslint/no-unused-vars": [

package.json

@@ -11,10 +11,10 @@
     "build-linux": "tsc && vite build --mode=desktop && cd desktop && make bin/linux/maputnik",
     "i18n:extract": "npx i18next-cli extract",
     "lint": "eslint",
-    "test": "cypress run",
+    "test": "playwright test",
+    "test-e2e": "playwright test",
     "test-unit": "vitest",
     "test-unit-ci": "vitest run --coverage --reporter=json",
-    "cy:open": "cypress open",
     "lint-css": "stylelint \"src/styles/*.scss\"",
     "sort-styles": "jq 'sort_by(.id)' src/config/styles.json > tmp.json && mv tmp.json src/config/styles.json"
   },
@@ -37,7 +37,7 @@
     "@mapbox/mapbox-gl-rtl-text": "^0.4.0",
     "@maplibre/maplibre-gl-geocoder": "^1.9.4",
     "@maplibre/maplibre-gl-inspect": "^1.8.2",
-    "@maplibre/maplibre-gl-style-spec": "^25.0.2",
+    "@maplibre/maplibre-gl-style-spec": "^26.2.1",
     "array-move": "^4.0.0",
     "buffer": "^6.0.3",
     "classnames": "^2.5.1",
@@ -47,7 +47,7 @@
     "downshift": "^9.4.0",
     "events": "^3.3.0",
     "file-saver": "^2.0.5",
-    "i18next": "^26.3.4",
+    "i18next": "^26.3.6",
     "i18next-browser-languagedetector": "^8.2.1",
     "i18next-resources-to-backend": "^1.2.1",
     "json-stringify-pretty-compact": "^4.0.0",
@@ -98,10 +98,9 @@
     }
   },
   "devDependencies": {
-    "@cypress/code-coverage": "^4.0.3",
     "@eslint/js": "^10.0.1",
     "@istanbuljs/nyc-config-typescript": "^1.0.2",
-    "@shellygo/cypress-test-utils": "^6.0.6",
+    "@playwright/test": "^1.61.1",
     "@stylistic/eslint-plugin": "^5.10.0",
     "@types/codemirror": "^5.60.17",
     "@types/color": "^4.2.1",
@@ -127,25 +126,24 @@
     "@vitejs/plugin-react": "5.2",
     "@vitest/coverage-v8": "^4.1.10",
     "cors": "^2.8.6",
-    "cypress": "^15.18.0",
+    "eslint": "^10.7.0",
-    "cypress-plugin-tab": "^2.0.0",
-    "eslint": "^10.6.0",
     "eslint-plugin-react": "^7.37.5",
     "eslint-plugin-react-hooks": "^7.1.1",
     "eslint-plugin-react-refresh": "^0.5.3",
-    "i18next-cli": "^1.65.0",
+    "i18next-cli": "^1.66.2",
     "istanbul": "^0.4.5",
     "istanbul-lib-coverage": "^3.2.2",
-    "postcss": "^8.5.16",
+    "nyc": "^18.0.0",
+    "postcss": "^8.5.21",
     "react-hot-loader": "^4.13.1",
-    "sass": "^1.101.0",
+    "sass": "^1.101.3",
-    "stylelint": "^17.14.0",
+    "stylelint": "^17.14.1",
     "stylelint-config-recommended-scss": "^17.0.1",
     "stylelint-scss": "^7.2.0",
     "typescript": "^6.0.3",
-    "typescript-eslint": "^8.62.1",
+    "typescript-eslint": "^8.65.0",
     "uuid": "^14.0.1",
-    "vite": "^8.1.3",
+    "vite": "^7.3.2",
     "vite-plugin-istanbul": "^9.0.1",
     "vitest": "^4.1.10"
   }

playwright.config.ts

@@ -0,0 +1,46 @@
+import { defineConfig, devices } from "@playwright/test";
+
+const isCI = !!process.env.CI;
+// When the app is already served elsewhere (e.g. the docker e2e job) set
+// E2E_NO_WEBSERVER=1 so Playwright does not start its own dev server.
+const useExternalServer = !!process.env.E2E_NO_WEBSERVER;
+const baseURL = process.env.E2E_BASE_URL ?? "http://localhost:8888/";
+
+export default defineConfig({
+  testDir: "./e2e",
+  testMatch: "**/*.spec.ts",
+  globalSetup: "./e2e/utils/e2e-setup.ts",
+  globalTeardown: "./e2e/utils/e2e-teardown.ts",
+  fullyParallel: true,
+  forbidOnly: isCI,
+  retries: isCI ? 2 : 0,
+  reporter: isCI ? [["list"], ["html", { open: "never" }]] : "list",
+  use: {
+    baseURL,
+    trace: "on-first-retry",
+  },
+  projects: [
+    {
+      name: "chromium",
+      use: {
+        ...devices["Desktop Chrome"],
+        launchOptions: {
+          // Allow WebGL (maplibre) to fall back to software rendering in headless.
+          args: [
+            "--disable-gpu",
+            "--enable-features=AllowSwiftShaderFallback,AllowSoftwareGLFallbackDueToCrashes",
+            "--enable-unsafe-swiftshader",
+          ],
+        },
+      },
+    },
+  ],
+  webServer: useExternalServer
+    ? undefined
+    : {
+      command: "npm run start",
+      url: "http://localhost:8888/maputnik/",
+      reuseExistingServer: !isCI,
+      timeout: 120000,
+    },
+});

src/components/App.tsx

@@ -11,29 +11,29 @@ import {type Map, type LayerSpecification, type StyleSpecification, type Validat
 import {validateStyleMin} from "@maplibre/maplibre-gl-style-spec";
 import latest from "@maplibre/maplibre-gl-style-spec/dist/latest.json";
 
-import MapMaplibreGl from "./MapMaplibreGl";
+import { MapMaplibreGl } from "./MapMaplibreGl";
-import MapOpenLayers from "./MapOpenLayers";
+import { MapOpenLayers } from "./MapOpenLayers";
-import CodeEditor from "./CodeEditor";
+import { CodeEditor } from "./CodeEditor";
-import LayerList from "./LayerList";
+import { LayerList } from "./LayerList";
-import LayerEditor from "./LayerEditor";
+import { LayerEditor } from "./LayerEditor";
-import AppToolbar, { type MapState } from "./AppToolbar";
+import { AppToolbar, type MapState } from "./AppToolbar";
-import AppLayout from "./AppLayout";
+import { AppLayout } from "./AppLayout";
-import MessagePanel from "./AppMessagePanel";
+import { AppMessagePanel as MessagePanel } from "./AppMessagePanel";
 
-import ModalSettings from "./modals/ModalSettings";
+import { ModalSettings } from "./modals/ModalSettings";
-import ModalExport from "./modals/ModalExport";
+import { ModalExport } from "./modals/ModalExport";
-import ModalSources from "./modals/ModalSources";
+import { ModalSources } from "./modals/ModalSources";
-import ModalOpen from "./modals/ModalOpen";
+import { ModalOpen } from "./modals/ModalOpen";
-import ModalShortcuts from "./modals/ModalShortcuts";
+import { ModalShortcuts } from "./modals/ModalShortcuts";
-import ModalDebug from "./modals/ModalDebug";
+import { ModalDebug } from "./modals/ModalDebug";
-import ModalGlobalState from "./modals/ModalGlobalState";
+import { ModalGlobalState } from "./modals/ModalGlobalState";
 
 import {downloadGlyphsMetadata, downloadSpriteMetadata} from "../libs/metadata";
-import style from "../libs/style";
+import { emptyStyle, getAccessToken, replaceAccessTokens } from "../libs/style";
 import { undoMessages, redoMessages } from "../libs/diffmessage";
 import { createStyleStore, type IStyleStore } from "../libs/store/style-store-factory";
 import { RevisionStore } from "../libs/revisions";
-import LayerWatcher from "../libs/layerwatcher";
+import { LayerWatcher } from "../libs/layerwatcher";
 import tokens from "../config/tokens.json";
 import isEqual from "lodash.isequal";
 import { type MapOptions } from "maplibre-gl";
@@ -48,19 +48,19 @@ function setFetchAccessToken(url: string, mapStyle: StyleSpecification) {
   const matchesThunderforest = url.match(/\.thunderforest\.com/);
   const matchesLocationIQ = url.match(/\.locationiq\.com/);
   if (matchesTilehosting || matchesMaptiler) {
-    const accessToken = style.getAccessToken("openmaptiles", mapStyle, {allowFallback: true});
+    const accessToken = getAccessToken("openmaptiles", mapStyle, {allowFallback: true});
     if (accessToken) {
       return url.replace("{key}", accessToken);
     }
   }
   else if (matchesThunderforest) {
-    const accessToken = style.getAccessToken("thunderforest", mapStyle, {allowFallback: true});
+    const accessToken = getAccessToken("thunderforest", mapStyle, {allowFallback: true});
     if (accessToken) {
       return url.replace("{key}", accessToken);
     }
   }
   else if (matchesLocationIQ) {
-    const accessToken = style.getAccessToken("locationiq", mapStyle, {allowFallback: true});
+    const accessToken = getAccessToken("locationiq", mapStyle, {allowFallback: true});
     if (accessToken) {
       return url.replace("{key}", accessToken);
     }
@@ -123,7 +123,7 @@ type AppState = {
   fileHandle: FileSystemFileHandle | null
 };
 
-export default class App extends React.Component<any, AppState> {
+export class App extends React.Component<any, AppState> {
   revisionStore: RevisionStore;
   styleStore: IStyleStore | null = null;
   layerWatcher: LayerWatcher;
@@ -137,7 +137,7 @@ export default class App extends React.Component<any, AppState> {
     this.state = {
       errors: [],
       infos: [],
-      mapStyle: style.emptyStyle,
+      mapStyle: emptyStyle,
       selectedLayerIndex: 0,
       sources: {},
       vectorLayers: {},
@@ -698,7 +698,7 @@ export default class App extends React.Component<any, AppState> {
       mapStyle: (dirtyMapStyle || mapStyle),
       mapView: this.state.mapView,
       replaceAccessTokens: (mapStyle: StyleSpecification) => {
-        return style.replaceAccessTokens(mapStyle, {
+        return replaceAccessTokens(mapStyle, {
           allowFallback: true
         });
       },

src/components/AppLayout.tsx

@@ -1,5 +1,5 @@
 import React from "react";
-import ScrollContainer from "./ScrollContainer";
+import { ScrollContainer } from "./ScrollContainer";
 import { type WithTranslation, withTranslation } from "react-i18next";
 import { IconContext } from "react-icons";
 
@@ -50,5 +50,4 @@ class AppLayoutInternal extends React.Component<AppLayoutInternalProps> {
   }
 }
 
-const AppLayout = withTranslation()(AppLayoutInternal);
+export const AppLayout = withTranslation()(AppLayoutInternal);
-export default AppLayout;

src/components/AppMessagePanel.tsx

@@ -61,5 +61,4 @@ class AppMessagePanelInternal extends React.Component<AppMessagePanelInternalPro
   }
 }
 
-const AppMessagePanel = withTranslation()(AppMessagePanelInternal);
+export const AppMessagePanel = withTranslation()(AppMessagePanelInternal);
-export default AppMessagePanel;

src/components/AppToolbar.tsx

@@ -306,5 +306,4 @@ class AppToolbarInternal extends React.Component<AppToolbarInternalProps> {
   }
 }
 
-const AppToolbar = withTranslation()(AppToolbarInternal);
+export const AppToolbar = withTranslation()(AppToolbarInternal);
-export default AppToolbar;

src/components/Block.tsx

@@ -1,7 +1,7 @@
 import React, {type CSSProperties, type PropsWithChildren, type SyntheticEvent} from "react";
 import classnames from "classnames";
-import FieldDocLabel from "./FieldDocLabel";
+import { FieldDocLabel } from "./FieldDocLabel";
-import Doc from "./Doc";
+import { Doc } from "./Doc";
 
 export type BlockProps = PropsWithChildren & {
   "data-wd-key"?: string
@@ -19,7 +19,7 @@ type BlockState = {
 };
 
 /** Wrap a component with a label */
-export default class Block extends React.Component<BlockProps, BlockState> {
+export class Block extends React.Component<BlockProps, BlockState> {
   _blockEl: HTMLDivElement | null = null;
 
   constructor (props: BlockProps) {

src/components/CodeEditor.tsx

@@ -1,4 +1,4 @@
-import InputJson from "./InputJson";
+import { InputJson } from "./InputJson";
 import React from "react";
 import { withTranslation, type WithTranslation } from "react-i18next";
 import { type StyleSpecification } from "maplibre-gl";
@@ -24,6 +24,4 @@ const CodeEditorInternal: React.FC<CodeEditorProps> = (props) => {
   </>;
 };
 
-const CodeEditor = withTranslation()(CodeEditorInternal);
+export const CodeEditor = withTranslation()(CodeEditorInternal);
-
-export default CodeEditor;

src/components/Collapse.tsx

@@ -9,7 +9,7 @@ type CollapseProps = {
 };
 
 
-export default class Collapse extends React.Component<CollapseProps> {
+export class Collapse extends React.Component<CollapseProps> {
   static defaultProps = {
     isActive: true
   };

src/components/Collapser.tsx

@@ -6,7 +6,7 @@ type CollapserProps = {
   style?: object
 };
 
-export default class Collapser extends React.Component<CollapserProps> {
+export class Collapser extends React.Component<CollapserProps> {
   render() {
     const iconStyle = {
       width: 20,

src/components/DataProperty.tsx

@@ -3,19 +3,19 @@ import {PiListPlusBold} from "react-icons/pi";
 import {TbMathFunction} from "react-icons/tb";
 import latest from "@maplibre/maplibre-gl-style-spec/dist/latest.json";
 
-import InputButton from "./InputButton";
+import { InputButton } from "./InputButton";
-import InputSpec from "./InputSpec";
+import { InputSpec } from "./InputSpec";
-import InputNumber from "./InputNumber";
+import { InputNumber } from "./InputNumber";
-import InputString from "./InputString";
+import { InputString } from "./InputString";
-import InputSelect from "./InputSelect";
+import { InputSelect } from "./InputSelect";
-import Block from "./Block";
+import { Block } from "./Block";
-import docUid from "../libs/document-uid";
+import { generateUniqueId as docUid } from "../libs/document-uid";
-import sortNumerically from "../libs/sort-numerically";
+import { sortNumerically } from "../libs/sort-numerically";
 import {findDefaultFromSpec} from "../libs/spec-helper";
 import { type WithTranslation, withTranslation } from "react-i18next";
 
-import labelFromFieldName from "../libs/label-from-field-name";
+import { labelFromFieldName } from "../libs/label-from-field-name";
-import DeleteStopButton from "./_DeleteStopButton";
+import { DeleteStopButton } from "./DeleteStopButton";
 import { type MappedLayerErrors } from "../libs/definitions";
 
 
@@ -289,6 +289,7 @@ class DataPropertyInternal extends React.Component<DataPropertyInternalProps, Da
           <Block
             label={t("Function")}
             key="function"
+            data-wd-key="function-type"
           >
             <div className="maputnik-data-spec-property-input">
               <InputSelect
@@ -303,6 +304,7 @@ class DataPropertyInternal extends React.Component<DataPropertyInternalProps, Da
             <Block
               label={t("Base")}
               key="base"
+              data-wd-key="function-base"
             >
               <div className="maputnik-data-spec-property-input">
                 <InputSpec
@@ -317,6 +319,7 @@ class DataPropertyInternal extends React.Component<DataPropertyInternalProps, Da
           <Block
             label={"Property"}
             key="property"
+            data-wd-key="function-property"
           >
             <div className="maputnik-data-spec-property-input">
               <InputString
@@ -330,6 +333,7 @@ class DataPropertyInternal extends React.Component<DataPropertyInternalProps, Da
             <Block
               label={t("Default")}
               key="default"
+              data-wd-key="function-default"
             >
               <InputSpec
                 fieldName={this.props.fieldName}
@@ -368,6 +372,7 @@ class DataPropertyInternal extends React.Component<DataPropertyInternalProps, Da
             }
             <InputButton
               className="maputnik-add-stop"
+              data-wd-key="convert-to-expression"
               onClick={this.props.onExpressionClick?.bind(this)}
             >
               <TbMathFunction style={{ verticalAlign: "text-bottom" }} />
@@ -380,5 +385,4 @@ class DataPropertyInternal extends React.Component<DataPropertyInternalProps, Da
   }
 }
 
-const DataProperty = withTranslation()(DataPropertyInternal);
+export const DataProperty = withTranslation()(DataPropertyInternal);
-export default DataProperty;

src/components/DeleteStopButton.tsx

@@ -1,6 +1,6 @@
 import React from "react";
 
-import InputButton from "./InputButton";
+import { InputButton } from "./InputButton";
 import {MdDelete} from "react-icons/md";
 import { type WithTranslation, withTranslation } from "react-i18next";
 
@@ -23,5 +23,4 @@ class DeleteStopButtonInternal extends React.Component<DeleteStopButtonInternalP
   }
 }
 
-const DeleteStopButton = withTranslation()(DeleteStopButtonInternal);
+export const DeleteStopButton = withTranslation()(DeleteStopButtonInternal);
-export default DeleteStopButton;

src/components/Doc.tsx

@@ -23,7 +23,7 @@ type DocProps = {
   }
 };
 
-export default class Doc extends React.Component<DocProps> {
+export class Doc extends React.Component<DocProps> {
   render () {
     const {fieldSpec} = this.props;
 

src/components/ExpressionProperty.tsx

@@ -2,10 +2,10 @@ import React from "react";
 import {MdDelete, MdUndo} from "react-icons/md";
 import { type WithTranslation, withTranslation } from "react-i18next";
 
-import Block from "./Block";
+import { Block } from "./Block";
-import InputButton from "./InputButton";
+import { InputButton } from "./InputButton";
-import labelFromFieldName from "../libs/label-from-field-name";
+import { labelFromFieldName } from "../libs/label-from-field-name";
-import FieldJson from "./FieldJson";
+import { FieldJson } from "./FieldJson";
 import type { StylePropertySpecification } from "maplibre-gl";
 import { type MappedLayerErrors } from "../libs/definitions";
 
@@ -50,6 +50,7 @@ class ExpressionPropertyInternal extends React.Component<ExpressionPropertyInter
             onClick={this.props.onUndo}
             disabled={undoDisabled}
             className="maputnik-delete-stop"
+            data-wd-key="undo-expression"
             title={t("Revert from expression")}
           >
             <MdUndo />
@@ -59,6 +60,7 @@ class ExpressionPropertyInternal extends React.Component<ExpressionPropertyInter
           key="delete_action"
           onClick={this.props.onDelete}
           className="maputnik-delete-stop"
+          data-wd-key="delete-expression"
           title={t("Delete expression")}
         >
           <MdDelete />
@@ -90,5 +92,4 @@ class ExpressionPropertyInternal extends React.Component<ExpressionPropertyInter
   }
 }
 
-const ExpressionProperty = withTranslation()(ExpressionPropertyInternal);
+export const ExpressionProperty = withTranslation()(ExpressionPropertyInternal);
-export default ExpressionProperty;

src/components/FieldArray.tsx

@@ -1,5 +1,5 @@
-import InputArray, { type InputArrayProps } from "./InputArray";
+import { InputArray, type InputArrayProps } from "./InputArray";
-import Fieldset from "./Fieldset";
+import { Fieldset } from "./Fieldset";
 
 type FieldArrayProps = InputArrayProps & {
   name?: string
@@ -8,12 +8,10 @@ type FieldArrayProps = InputArrayProps & {
   }
 };
 
-const FieldArray: React.FC<FieldArrayProps> = (props) => {
+export const FieldArray: React.FC<FieldArrayProps> = (props) => {
   return (
     <Fieldset label={props.label} fieldSpec={props.fieldSpec}>
       <InputArray {...props} />
     </Fieldset>
   );
 };
-
-export default FieldArray;

src/components/FieldAutocomplete.tsx

@@ -1,5 +1,5 @@
-import Block from "./Block";
+import { Block } from "./Block";
-import InputAutocomplete, { type InputAutocompleteProps } from "./InputAutocomplete";
+import { InputAutocomplete, type InputAutocompleteProps } from "./InputAutocomplete";
 
 
 type FieldAutocompleteProps = InputAutocompleteProps & {
@@ -7,12 +7,10 @@ type FieldAutocompleteProps = InputAutocompleteProps & {
 };
 
 
-const FieldAutocomplete: React.FC<FieldAutocompleteProps> = (props) => {
+export const FieldAutocomplete: React.FC<FieldAutocompleteProps> = (props) => {
   return (
     <Block label={props.label}>
       <InputAutocomplete {...props} />
     </Block>
   );
 };
-
-export default FieldAutocomplete;

src/components/FieldCheckbox.tsx

@@ -1,5 +1,5 @@
-import Block from "./Block";
+import { Block } from "./Block";
-import InputCheckbox, {type InputCheckboxProps} from "./InputCheckbox";
+import { InputCheckbox, type InputCheckboxProps } from "./InputCheckbox";
 
 
 type FieldCheckboxProps = InputCheckboxProps & {
@@ -7,12 +7,10 @@ type FieldCheckboxProps = InputCheckboxProps & {
 };
 
 
-const FieldCheckbox: React.FC<FieldCheckboxProps> = (props) => {
+export const FieldCheckbox: React.FC<FieldCheckboxProps> = (props) => {
   return (
     <Block label={props.label}>
       <InputCheckbox {...props} />
     </Block>
   );
 };
-
-export default FieldCheckbox;

src/components/FieldColor.tsx

@@ -1,5 +1,5 @@
-import Block from "./Block";
+import { Block } from "./Block";
-import InputColor, {type InputColorProps} from "./InputColor";
+import { InputColor, type InputColorProps } from "./InputColor";
 
 
 type FieldColorProps = InputColorProps & {
@@ -10,12 +10,10 @@ type FieldColorProps = InputColorProps & {
 };
 
 
-const FieldColor: React.FC<FieldColorProps> = (props) => {
+export const FieldColor: React.FC<FieldColorProps> = (props) => {
   return (
     <Block label={props.label} fieldSpec={props.fieldSpec}>
       <InputColor {...props} />
     </Block>
   );
 };
-
-export default FieldColor;

src/components/FieldComment.tsx

@@ -1,7 +1,7 @@
 import React from "react";
 
-import Block from "./Block";
+import { Block } from "./Block";
-import InputString from "./InputString";
+import { InputString } from "./InputString";
 import { type WithTranslation, withTranslation } from "react-i18next";
 
 type FieldCommentInternalProps = {
@@ -36,5 +36,4 @@ const FieldCommentInternal: React.FC<FieldCommentInternalProps> = (props) => {
   );
 };
 
-const FieldComment = withTranslation()(FieldCommentInternal);
+export const FieldComment = withTranslation()(FieldCommentInternal);
-export default FieldComment;

src/components/FieldDocLabel.tsx

@@ -10,7 +10,7 @@ type FieldDocLabelProps = {
 };
 
 
-const FieldDocLabel: React.FC<FieldDocLabelProps> = (props) => {
+export const FieldDocLabel: React.FC<FieldDocLabelProps> = (props) => {
   const [open, setOpen] = React.useState(false);
 
   const onToggleDoc = (state: boolean) => {
@@ -49,5 +49,3 @@ const FieldDocLabel: React.FC<FieldDocLabelProps> = (props) => {
   }
   return <div />;
 };
-
-export default FieldDocLabel;

src/components/FieldDynamicArray.tsx

@@ -1,16 +1,17 @@
-import InputDynamicArray, {type InputDynamicArrayProps} from "./InputDynamicArray";
+import { InputDynamicArray, type InputDynamicArrayProps } from "./InputDynamicArray";
-import Fieldset from "./Fieldset";
+import { Fieldset } from "./Fieldset";
 
 type FieldDynamicArrayProps = InputDynamicArrayProps & {
-  name?: string
+  name?: string;
+  fieldSpec?: {
+    value?: string;
+  }
 };
 
-const FieldDynamicArray: React.FC<FieldDynamicArrayProps> = (props) => {
+export const FieldDynamicArray: React.FC<FieldDynamicArrayProps> = (props) => {
   return (
     <Fieldset label={props.label}>
       <InputDynamicArray {...props} />
     </Fieldset>
   );
 };
-
-export default FieldDynamicArray;

src/components/FieldEnum.tsx

@@ -1,5 +1,5 @@
-import InputEnum, {type InputEnumProps} from "./InputEnum";
+import { InputEnum, type InputEnumProps } from "./InputEnum";
-import Fieldset from "./Fieldset";
+import { Fieldset } from "./Fieldset";
 
 
 type FieldEnumProps = InputEnumProps & {
@@ -10,12 +10,10 @@ type FieldEnumProps = InputEnumProps & {
 };
 
 
-const FieldEnum: React.FC<FieldEnumProps> = (props) => {
+export const FieldEnum: React.FC<FieldEnumProps> = (props) => {
   return (
     <Fieldset label={props.label} fieldSpec={props.fieldSpec}>
       <InputEnum {...props} />
     </Fieldset>
   );
 };
-
-export default FieldEnum;

src/components/FieldFunction.tsx

@@ -1,9 +1,9 @@
 import React from "react";
 
-import SpecProperty from "./_SpecProperty";
+import { SpecProperty } from "./SpecProperty";
-import DataProperty, { type Stop } from "./_DataProperty";
+import { DataProperty, type Stop } from "./DataProperty";
-import ZoomProperty from "./_ZoomProperty";
+import { ZoomProperty } from "./ZoomProperty";
-import ExpressionProperty from "./_ExpressionProperty";
+import { ExpressionProperty } from "./ExpressionProperty";
 import {function as styleFunction} from "@maplibre/maplibre-gl-style-spec";
 import {findDefaultFromSpec} from "../libs/spec-helper";
 import { type MappedLayerErrors } from "../libs/definitions";
@@ -128,7 +128,7 @@ type FieldFunctionProps = {
 /** Supports displaying spec field for zoom function objects
  * https://www.mapbox.com/mapbox-gl-style-spec/#types-function-zoom-property
  */
-const FieldFunction: React.FC<FieldFunctionProps> = (props) => {
+export const FieldFunction: React.FC<FieldFunctionProps> = (props) => {
   const [dataType, setDataType] = React.useState(
     getDataType(props.value, props.fieldSpec)
   );
@@ -402,5 +402,3 @@ const FieldFunction: React.FC<FieldFunctionProps> = (props) => {
     </div>
   );
 };
-
-export default FieldFunction;

src/components/FieldId.tsx

@@ -1,7 +1,7 @@
 
 import latest from "@maplibre/maplibre-gl-style-spec/dist/latest.json";
-import Block from "./Block";
+import { Block } from "./Block";
-import InputString from "./InputString";
+import { InputString } from "./InputString";
 
 type FieldIdProps = {
   value: string
@@ -10,7 +10,7 @@ type FieldIdProps = {
   error?: {message: string}
 };
 
-const FieldId: React.FC<FieldIdProps> = (props) => {
+export const FieldId: React.FC<FieldIdProps> = (props) => {
   return (
     <Block label="ID" fieldSpec={latest.layer.id}
       data-wd-key={props.wdKey}
@@ -24,5 +24,3 @@ const FieldId: React.FC<FieldIdProps> = (props) => {
     </Block>
   );
 };
-
-export default FieldId;

src/components/FieldJson.tsx

@@ -1,11 +1,9 @@
-import InputJson, {type InputJsonProps} from "./InputJson";
+import { InputJson, type InputJsonProps } from "./InputJson";
 
 
 type FieldJsonProps = InputJsonProps & {};
 
 
-const FieldJson: React.FC<FieldJsonProps> = (props) => {
+export const FieldJson: React.FC<FieldJsonProps> = (props) => {
   return <InputJson {...props} />;
 };
-
-export default FieldJson;

src/components/FieldMaxZoom.tsx

@@ -1,8 +1,8 @@
 import React from "react";
 
 import latest from "@maplibre/maplibre-gl-style-spec/dist/latest.json";
-import Block from "./Block";
+import { Block } from "./Block";
-import InputNumber from "./InputNumber";
+import { InputNumber } from "./InputNumber";
 import { type WithTranslation, withTranslation } from "react-i18next";
 
 type FieldMaxZoomInternalProps = {
@@ -31,5 +31,4 @@ const FieldMaxZoomInternal: React.FC<FieldMaxZoomInternalProps> = (props) => {
   );
 };
 
-const FieldMaxZoom = withTranslation()(FieldMaxZoomInternal);
+export const FieldMaxZoom = withTranslation()(FieldMaxZoomInternal);
-export default FieldMaxZoom;

src/components/FieldMinZoom.tsx

@@ -1,8 +1,8 @@
 import React from "react";
 
 import latest from "@maplibre/maplibre-gl-style-spec/dist/latest.json";
-import Block from "./Block";
+import { Block } from "./Block";
-import InputNumber from "./InputNumber";
+import { InputNumber } from "./InputNumber";
 import { type WithTranslation, withTranslation } from "react-i18next";
 
 type FieldMinZoomInternalProps = {
@@ -31,5 +31,4 @@ const FieldMinZoomInternal: React.FC<FieldMinZoomInternalProps> = (props) => {
   );
 };
 
-const FieldMinZoom = withTranslation()(FieldMinZoomInternal);
+export const FieldMinZoom = withTranslation()(FieldMinZoomInternal);
-export default FieldMinZoom;

src/components/FieldMultiInput.tsx

@@ -1,5 +1,5 @@
-import InputMultiInput, {type InputMultiInputProps} from "./InputMultiInput";
+import { InputMultiInput, type InputMultiInputProps } from "./InputMultiInput";
-import Fieldset from "./Fieldset";
+import { Fieldset } from "./Fieldset";
 
 
 type FieldMultiInputProps = InputMultiInputProps & {
@@ -7,12 +7,10 @@ type FieldMultiInputProps = InputMultiInputProps & {
 };
 
 
-const FieldMultiInput: React.FC<FieldMultiInputProps> = (props) => {
+export const FieldMultiInput: React.FC<FieldMultiInputProps> = (props) => {
   return (
     <Fieldset label={props.label}>
       <InputMultiInput {...props} />
     </Fieldset>
   );
 };
-
-export default FieldMultiInput;

src/components/FieldNumber.tsx

@@ -1,5 +1,5 @@
-import InputNumber, {type InputNumberProps} from "./InputNumber";
+import { InputNumber, type InputNumberProps } from "./InputNumber";
-import Block from "./Block";
+import { Block } from "./Block";
 
 
 type FieldNumberProps = InputNumberProps & {
@@ -10,12 +10,10 @@ type FieldNumberProps = InputNumberProps & {
 };
 
 
-const FieldNumber: React.FC<FieldNumberProps> = (props) => {
+export const FieldNumber: React.FC<FieldNumberProps> = (props) => {
   return (
     <Block label={props.label} fieldSpec={props.fieldSpec}>
       <InputNumber {...props} />
     </Block>
   );
 };
-
-export default FieldNumber;

src/components/FieldSelect.tsx

@@ -1,5 +1,5 @@
-import Block from "./Block";
+import { Block } from "./Block";
-import InputSelect, {type InputSelectProps} from "./InputSelect";
+import { InputSelect, type InputSelectProps } from "./InputSelect";
 
 
 type FieldSelectProps = InputSelectProps & {
@@ -10,12 +10,10 @@ type FieldSelectProps = InputSelectProps & {
 };
 
 
-const FieldSelect: React.FC<FieldSelectProps> = (props) => {
+export const FieldSelect: React.FC<FieldSelectProps> = (props) => {
   return (
     <Block label={props.label} fieldSpec={props.fieldSpec}>
       <InputSelect {...props} />
     </Block>
   );
 };
-
-export default FieldSelect;

src/components/FieldSource.tsx

@@ -1,8 +1,8 @@
 import React from "react";
 
 import latest from "@maplibre/maplibre-gl-style-spec/dist/latest.json";
-import Block from "./Block";
+import { Block } from "./Block";
-import InputAutocomplete from "./InputAutocomplete";
+import { InputAutocomplete } from "./InputAutocomplete";
 import { type WithTranslation, withTranslation } from "react-i18next";
 
 type FieldSourceInternalProps = {
@@ -38,5 +38,4 @@ const FieldSourceInternal: React.FC<FieldSourceInternalProps> = ({
 };
 
 
-const FieldSource = withTranslation()(FieldSourceInternal);
+export const FieldSource = withTranslation()(FieldSourceInternal);
-export default FieldSource;

src/components/FieldSourceLayer.tsx

@@ -1,8 +1,8 @@
 import React from "react";
 
 import {latest} from "@maplibre/maplibre-gl-style-spec";
-import Block from "./Block";
+import { Block } from "./Block";
-import InputAutocomplete from "./InputAutocomplete";
+import { InputAutocomplete } from "./InputAutocomplete";
 import { type WithTranslation, withTranslation } from "react-i18next";
 
 type FieldSourceLayerInternalProps = {
@@ -35,5 +35,4 @@ const FieldSourceLayerInternal: React.FC<FieldSourceLayerInternalProps> = ({
   );
 };
 
-const FieldSourceLayer = withTranslation()(FieldSourceLayerInternal);
+export const FieldSourceLayer = withTranslation()(FieldSourceLayerInternal);
-export default FieldSourceLayer;

src/components/FieldSpec.tsx

@@ -1,6 +1,6 @@
-import Block, { type BlockProps } from "./Block";
+import { Block, type BlockProps } from "./Block";
-import InputSpec, { type FieldSpecType, type InputSpecProps } from "./InputSpec";
+import { InputSpec, type FieldSpecType, type InputSpecProps } from "./InputSpec";
-import Fieldset, { type FieldsetProps } from "./Fieldset";
+import { Fieldset, type FieldsetProps } from "./Fieldset";
 
 function getElementFromType(fieldSpec: { type?: FieldSpecType, values?: unknown[] }): typeof Fieldset | typeof Block {
   switch(fieldSpec.type) {
@@ -36,7 +36,7 @@ function getElementFromType(fieldSpec: { type?: FieldSpecType, values?: unknown[
 
 export type FieldSpecProps = InputSpecProps & BlockProps & FieldsetProps;
 
-const FieldSpec: React.FC<FieldSpecProps> = (props) => {
+export const FieldSpec: React.FC<FieldSpecProps> = (props) => {
   const TypeBlock = getElementFromType(props.fieldSpec!);
 
   return (
@@ -45,5 +45,3 @@ const FieldSpec: React.FC<FieldSpecProps> = (props) => {
     </TypeBlock>
   );
 };
-
-export default FieldSpec;

src/components/FieldString.tsx

@@ -1,5 +1,5 @@
-import Block from "./Block";
+import { Block } from "./Block";
-import InputString, {type InputStringProps} from "./InputString";
+import { InputString, type InputStringProps } from "./InputString";
 
 type FieldStringProps = InputStringProps & {
   name?: string
@@ -9,12 +9,10 @@ type FieldStringProps = InputStringProps & {
   }
 };
 
-const FieldString: React.FC<FieldStringProps> = (props) => {
+export const FieldString: React.FC<FieldStringProps> = (props) => {
   return (
     <Block label={props.label} fieldSpec={props.fieldSpec}>
       <InputString {...props} />
     </Block>
   );
 };
-
-export default FieldString;

src/components/FieldType.tsx

@@ -1,8 +1,8 @@
 import React from "react";
 import {v8} from "@maplibre/maplibre-gl-style-spec";
-import Block from "./Block";
+import { Block } from "./Block";
-import InputSelect from "./InputSelect";
+import { InputSelect } from "./InputSelect";
-import InputString from "./InputString";
+import { InputString } from "./InputString";
 import { type WithTranslation, withTranslation } from "react-i18next";
 import { startCase } from "lodash";
 
@@ -43,5 +43,4 @@ const FieldTypeInternal: React.FC<FieldTypeInternalProps> = ({
   );
 };
 
-const FieldType = withTranslation()(FieldTypeInternal);
+export const FieldType = withTranslation()(FieldTypeInternal);
-export default FieldType;

src/components/FieldUrl.tsx

@@ -1,5 +1,5 @@
-import InputUrl, {type FieldUrlProps as InputUrlProps} from "./InputUrl";
+import { InputUrl, type FieldUrlProps as InputUrlProps } from "./InputUrl";
-import Block from "./Block";
+import { Block } from "./Block";
 
 
 type FieldUrlProps = InputUrlProps & {
@@ -10,12 +10,10 @@ type FieldUrlProps = InputUrlProps & {
 };
 
 
-const FieldUrl: React.FC<FieldUrlProps> = (props) => {
+export const FieldUrl: React.FC<FieldUrlProps> = (props) => {
   return (
     <Block label={props.label} fieldSpec={props.fieldSpec}>
       <InputUrl {...props} />
     </Block>
   );
 };
-
-export default FieldUrl;

src/components/Fieldset.tsx

@@ -1,8 +1,8 @@
 import React, { type PropsWithChildren, type ReactElement } from "react";
 import classnames from "classnames";
-import FieldDocLabel from "./FieldDocLabel";
+import { FieldDocLabel } from "./FieldDocLabel";
-import Doc from "./Doc";
+import { Doc } from "./Doc";
-import generateUniqueId from "../libs/document-uid";
+import { generateUniqueId } from "../libs/document-uid";
 
 export type FieldsetProps = PropsWithChildren & {
   label?: string,
@@ -12,7 +12,7 @@ export type FieldsetProps = PropsWithChildren & {
 };
 
 
-const Fieldset: React.FC<FieldsetProps> = (props) => {
+export const Fieldset: React.FC<FieldsetProps> = (props) => {
   const [showDoc, setShowDoc] = React.useState(false);
   const labelId = React.useRef(generateUniqueId("fieldset_label_"));
 
@@ -49,5 +49,3 @@ const Fieldset: React.FC<FieldsetProps> = (props) => {
     </div>
   );
 };
-
-export default Fieldset;

src/components/FilterEditor.tsx

@@ -7,13 +7,13 @@ import {migrate, convertFilter} from "@maplibre/maplibre-gl-style-spec";
 import latest from "@maplibre/maplibre-gl-style-spec/dist/latest.json";
 
 import {combiningFilterOps} from "../libs/filterops";
-import InputSelect from "./InputSelect";
+import { InputSelect } from "./InputSelect";
-import Block from "./Block";
+import { Block } from "./Block";
-import SingleFilterEditor from "./SingleFilterEditor";
+import { SingleFilterEditor } from "./SingleFilterEditor";
-import FilterEditorBlock from "./FilterEditorBlock";
+import { FilterEditorBlock } from "./FilterEditorBlock";
-import InputButton from "./InputButton";
+import { InputButton } from "./InputButton";
-import Doc from "./Doc";
+import { Doc } from "./Doc";
-import ExpressionProperty from "./_ExpressionProperty";
+import { ExpressionProperty } from "./ExpressionProperty";
 import { type WithTranslation, withTranslation } from "react-i18next";
 import type { MappedLayerErrors, StyleSpecificationWithId } from "../libs/definitions";
 
@@ -215,6 +215,7 @@ class FilterEditorInternal extends React.Component<FilterEditorInternalProps, Fi
             onClick={this.makeExpression}
             title={t("Convert to expression")}
             className="maputnik-make-zoom-function"
+            data-wd-key="filter-convert-to-expression"
           >
             <TbMathFunction />
           </InputButton>
@@ -248,6 +249,7 @@ class FilterEditorInternal extends React.Component<FilterEditorInternalProps, Fi
             fieldSpec={fieldSpec}
             label={t("Filter")}
             action={actions}
+            data-wd-key="filter-combining-operator"
           >
             <InputSelect
               value={combiningOp}
@@ -316,5 +318,4 @@ class FilterEditorInternal extends React.Component<FilterEditorInternalProps, Fi
   }
 }
 
-const FilterEditor = withTranslation()(FilterEditorInternal);
+export const FilterEditor = withTranslation()(FilterEditorInternal);
-export default FilterEditor;

src/components/FilterEditorBlock.tsx

@@ -1,5 +1,5 @@
 import React, { type PropsWithChildren } from "react";
-import InputButton from "./InputButton";
+import { InputButton } from "./InputButton";
 import {MdDelete} from "react-icons/md";
 import { type WithTranslation, withTranslation } from "react-i18next";
 
@@ -27,5 +27,4 @@ class FilterEditorBlockInternal extends React.Component<FilterEditorBlockInterna
   }
 }
 
-const FilterEditorBlock = withTranslation()(FilterEditorBlockInternal);
+export const FilterEditorBlock = withTranslation()(FilterEditorBlockInternal);
-export default FilterEditorBlock;

src/components/FunctionButtons.tsx

@@ -1,6 +1,6 @@
 import React from "react";
 
-import InputButton from "./InputButton";
+import { InputButton } from "./InputButton";
 import {MdFunctions, MdInsertChart} from "react-icons/md";
 import { TbMathFunction } from "react-icons/tb";
 import { type WithTranslation, withTranslation } from "react-i18next";
@@ -67,5 +67,4 @@ class FunctionInputButtonsInternal extends React.Component<FunctionInputButtonsI
   }
 }
 
-const FunctionInputButtons = withTranslation()(FunctionInputButtonsInternal);
+export const FunctionInputButtons = withTranslation()(FunctionInputButtonsInternal);
-export default FunctionInputButtons;

src/components/IconLayer.tsx

@@ -13,7 +13,7 @@ type IconLayerProps = {
   className?: string
 };
 
-const IconLayer: React.FC<IconLayerProps> = (props) => {
+export const IconLayer: React.FC<IconLayerProps> = (props) => {
   const iconProps = { style: props.style };
   switch(props.type) {
     case "fill-extrusion": return <IoMdCube {...iconProps} />;
@@ -29,5 +29,3 @@ const IconLayer: React.FC<IconLayerProps> = (props) => {
     default: return <MdPriorityHigh {...iconProps} />;
   }
 };
-
-export default IconLayer;

src/components/InputArray.tsx

@@ -1,6 +1,6 @@
 import React from "react";
-import InputString from "./InputString";
+import { InputString } from "./InputString";
-import InputNumber from "./InputNumber";
+import { InputNumber } from "./InputNumber";
 
 export type InputArrayProps = {
   value: (string | number | undefined)[]
@@ -17,7 +17,7 @@ type InputArrayState = {
   initialPropsValue: unknown[]
 };
 
-export default class InputArray extends React.Component<InputArrayProps, InputArrayState> {
+export class InputArray extends React.Component<InputArrayProps, InputArrayState> {
   static defaultProps = {
     value: [],
     default: [],

src/components/InputAutocomplete.browser.test.tsx

@@ -1,18 +0,0 @@
-import InputAutocomplete from "./InputAutocomplete";
-import { mount } from "cypress/react";
-
-const fruits = ["apple", "banana", "cherry"];
-
-describe("<InputAutocomplete />", () => {
-  it("filters options when typing", () => {
-    mount(
-      <InputAutocomplete aria-label="Fruit" options={fruits.map(f => [f, f])} />
-    );
-    cy.get("input").focus();
-    cy.get(".maputnik-autocomplete-menu-item").should("have.length", 3);
-    cy.get("input").type("ch");
-    cy.get(".maputnik-autocomplete-menu-item").should("have.length", 1).and("contain", "cherry");
-    cy.get(".maputnik-autocomplete-menu-item").click();
-    cy.get("input").should("have.value", "cherry");
-  });
-});

src/components/InputAutocomplete.tsx

@@ -11,7 +11,7 @@ export type InputAutocompleteProps = {
   "aria-label"?: string
 };
 
-export default function InputAutocomplete({
+export function InputAutocomplete({
   value,
   options = [],
   onChange = () => {},

src/components/InputButton.tsx

@@ -14,7 +14,7 @@ type InputButtonProps = {
   title?: string
 };
 
-export default class InputButton extends React.Component<InputButtonProps> {
+export class InputButton extends React.Component<InputButtonProps> {
   render() {
     return <button
       id={this.props.id}

src/components/InputCheckbox.tsx

@@ -6,7 +6,7 @@ export type InputCheckboxProps = {
   onChange(...args: unknown[]): unknown
 };
 
-export default class InputCheckbox extends React.Component<InputCheckboxProps> {
+export class InputCheckbox extends React.Component<InputCheckboxProps> {
   static defaultProps = {
     value: false,
   };

src/components/InputColor.tsx

@@ -20,7 +20,7 @@ export type InputColorProps = {
 };
 
 /*** Number fields with support for min, max and units and documentation*/
-export default class InputColor extends React.Component<InputColorProps> {
+export class InputColor extends React.Component<InputColorProps> {
   state = {
     pickerOpened: false
   };

src/components/InputDynamicArray.tsx

@@ -3,13 +3,13 @@ import capitalize from "lodash.capitalize";
 import {MdDelete} from "react-icons/md";
 import { type WithTranslation, withTranslation } from "react-i18next";
 
-import InputString from "./InputString";
+import { InputString } from "./InputString";
-import InputNumber from "./InputNumber";
+import { InputNumber } from "./InputNumber";
-import InputButton from "./InputButton";
+import { InputButton } from "./InputButton";
-import FieldDocLabel from "./FieldDocLabel";
+import { FieldDocLabel } from "./FieldDocLabel";
-import InputEnum from "./InputEnum";
+import { InputEnum } from "./InputEnum";
-import InputUrl from "./InputUrl";
+import { InputUrl } from "./InputUrl";
-import InputColor from "./InputColor";
+import { InputColor } from "./InputColor";
 
 
 export type InputDynamicArrayProps = {
@@ -141,9 +141,7 @@ class InputDynamicArrayInternal extends React.Component<InputDynamicArrayInterna
   }
 }
 
-const InputDynamicArray = withTranslation()(InputDynamicArrayInternal);
+export const InputDynamicArray = withTranslation()(InputDynamicArrayInternal);
-export default InputDynamicArray;
-
 type DeleteValueInputButtonProps = {
   onClick?(...args: unknown[]): unknown
 } & WithTranslation;

src/components/InputEnum.tsx

@@ -1,6 +1,6 @@
 import React from "react";
-import InputSelect from "./InputSelect";
+import { InputSelect } from "./InputSelect";
-import InputMultiInput from "./InputMultiInput";
+import { InputMultiInput } from "./InputMultiInput";
 
 
 function optionsLabelLength(options: any[]) {
@@ -25,7 +25,7 @@ export type InputEnumProps = {
 };
 
 
-export default class InputEnum extends React.Component<InputEnumProps> {
+export class InputEnum extends React.Component<InputEnumProps> {
   render() {
     const {options, value, onChange, name, label} = this.props;
 

src/components/InputFont.tsx

@@ -1,5 +1,5 @@
 import React from "react";
-import InputAutocomplete from "./InputAutocomplete";
+import { InputAutocomplete } from "./InputAutocomplete";
 
 export type InputFontProps = {
   name: string
@@ -11,7 +11,7 @@ export type InputFontProps = {
   "aria-label"?: string
 };
 
-export default class InputFont extends React.Component<InputFontProps> {
+export class InputFont extends React.Component<InputFontProps> {
   static defaultProps = {
     fonts: []
   };

src/components/InputJson.tsx

@@ -135,5 +135,4 @@ class InputJsonInternal extends React.Component<InputJsonInternalProps, InputJso
   }
 }
 
-const InputJson = withTranslation()(InputJsonInternal);
+export const InputJson = withTranslation()(InputJsonInternal);
-export default InputJson;

src/components/InputMultiInput.tsx

@@ -9,7 +9,7 @@ export type InputMultiInputProps = {
   "aria-label"?: string
 };
 
-export default class InputMultiInput extends React.Component<InputMultiInputProps> {
+export class InputMultiInput extends React.Component<InputMultiInputProps> {
   render() {
     let options = this.props.options;
     if(options.length > 0 && !Array.isArray(options[0])) {

src/components/InputNumber.tsx

@@ -1,5 +1,5 @@
 import React, { type BaseSyntheticEvent } from "react";
-import generateUniqueId from "../libs/document-uid";
+import { generateUniqueId } from "../libs/document-uid";
 
 export type InputNumberProps = {
   value?: number
@@ -25,7 +25,7 @@ type InputNumberState = {
   dirtyValue?: number | string | undefined
 };
 
-export default class InputNumber extends React.Component<InputNumberProps, InputNumberState> {
+export class InputNumber extends React.Component<InputNumberProps, InputNumberState> {
   static defaultProps = {
     rangeStep: 1
   };

src/components/InputSelect.tsx

@@ -10,7 +10,7 @@ export type InputSelectProps = {
   "aria-label"?: string
 };
 
-export default class InputSelect extends React.Component<InputSelectProps> {
+export class InputSelect extends React.Component<InputSelectProps> {
   render() {
     let options = this.props.options;
     if(options.length > 0 && !Array.isArray(options[0])) {

src/components/InputSpec.tsx

@@ -1,14 +1,14 @@
 import React, { type ReactElement } from "react";
 
-import InputColor, { type InputColorProps } from "./InputColor";
+import { InputColor, type InputColorProps } from "./InputColor";
-import InputNumber, { type InputNumberProps } from "./InputNumber";
+import { InputNumber, type InputNumberProps } from "./InputNumber";
-import InputCheckbox, { type InputCheckboxProps } from "./InputCheckbox";
+import { InputCheckbox, type InputCheckboxProps } from "./InputCheckbox";
-import InputString, { type InputStringProps } from "./InputString";
+import { InputString, type InputStringProps } from "./InputString";
-import InputArray, { type InputArrayProps } from "./InputArray";
+import { InputArray, type InputArrayProps } from "./InputArray";
-import InputDynamicArray, { type InputDynamicArrayProps } from "./InputDynamicArray";
+import { InputDynamicArray, type InputDynamicArrayProps } from "./InputDynamicArray";
-import InputFont, { type InputFontProps } from "./InputFont";
+import { InputFont, type InputFontProps } from "./InputFont";
-import InputAutocomplete, { type InputAutocompleteProps } from "./InputAutocomplete";
+import { InputAutocomplete, type InputAutocompleteProps } from "./InputAutocomplete";
-import InputEnum, { type InputEnumProps } from "./InputEnum";
+import { InputEnum, type InputEnumProps } from "./InputEnum";
 import capitalize from "lodash.capitalize";
 
 const iconProperties = ["background-pattern", "fill-pattern", "line-pattern", "fill-extrusion-pattern", "icon-image"];
@@ -38,7 +38,7 @@ export type InputSpecProps = {
 /** Display any field from the Maplibre GL style spec and
  * choose the correct field component based on the @{fieldSpec}
  * to display @{value}. */
-export default class InputSpec extends React.Component<InputSpecProps> {
+export class InputSpec extends React.Component<InputSpecProps> {
 
   childNodes() {
     const commonProps = {

src/components/InputString.tsx

@@ -20,7 +20,7 @@ type InputStringState = {
   value?: string
 };
 
-export default class InputString extends React.Component<InputStringProps, InputStringState> {
+export class InputString extends React.Component<InputStringProps, InputStringState> {
   static defaultProps = {
     onInput: () => {},
   };