@element-hq/element-web-playwright-common 2.2.5 → 2.2.6

package/Dockerfile

@@ -6,4 +6,6 @@ WORKDIR /work
 # fonts-dejavu is needed for the same RTL rendering as on CI
 RUN apt-get update && apt-get -y install docker.io fonts-dejavu
 
-ENTRYPOINT ["npx", "playwright", "test", "--update-snapshots", "--reporter", "line"]
+COPY docker-entrypoint.sh /docker-entrypoint.sh
+
+ENTRYPOINT ["/docker-entrypoint.sh"]

package/docker-entrypoint.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+set -e
+
+if [[ "$YARN_INSTALL" == "true" ]]; then
+  yarn install --frozen-lockfile
+fi
+
+npx playwright test --update-snapshots --reporter line "$@"

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@element-hq/element-web-playwright-common",
     "type": "module",
-    "version": "2.2.5",
+    "version": "2.2.6",
     "license": "SEE LICENSE IN README.md",
     "repository": {
         "type": "git",
@@ -31,7 +31,7 @@
     "dependencies": {
         "@axe-core/playwright": "^4.10.1",
         "@testcontainers/postgresql": "^11.0.0",
-        "glob": "^13.0.0",
+        "glob": "^13.0.1",
         "lodash-es": "^4.17.23",
         "mailpit-api": "^1.2.0",
         "strip-ansi": "^7.1.0",

package/playwright-screenshots.sh

@@ -8,11 +8,18 @@ SCRIPT_DIR=$(dirname "$SCRIPT_PATH")
 
 IMAGE_NAME="element-web-playwright-common"
 
+if docker --version | grep -q podman; then docker_is_podman=1; fi
+
 build_image() {
   echo "Building $IMAGE_NAME image in $SCRIPT_DIR"
 
   # Check the playwright version
-  PW_VERSION=$(yarn list --pattern @playwright/test --depth=0 --json --non-interactive --no-progress | jq -r '.data.trees[].name | split("@") | last')
+  PM=$(cat package.json | jq -r '.packageManager')
+  if [[ $PM == "pnpm@"* ]]; then
+    PW_VERSION=$(pnpm list @playwright/test --depth=0 --json | jq -r '.[].devDependencies["@playwright/test"].version')
+  else
+    PW_VERSION=$(yarn list --pattern @playwright/test --depth=0 --json --non-interactive --no-progress | jq -r '.data.trees[].name | split("@") | last')
+  fi
   echo "with Playwright version $PW_VERSION"
 
   # Build image
@@ -59,7 +66,10 @@ while [[ $# -gt 0 ]]; do
     # It's a volume rather than a directory because otherwise things tend to start picking up
     # files from it in the native environment and break.
     --with-node-modules)
-      RUN_ARGS+=(--mount "type=volume,src=ew-docker-node-modules,dst=/work/node_modules,volume-nocopy")
+      mount_param="type=volume,src=ew-docker-node-modules,dst=/work/node_modules"
+      # podman doesn't support `volume-nocopy`
+      if [ -z "$docker_is_podman" ]; then mount_param+=",volume-nocopy"; fi
+      RUN_ARGS+=(--mount "${mount_param}" -e YARN_INSTALL=true)
       shift
       ;;
     # Sets a different entrypoint (in which case the default arguments to the script will be ignored)
@@ -84,7 +94,7 @@ popd > /dev/null
 for LINK in $SYMLINKS; do
   TARGET=$(readlink -f "node_modules/$LINK") || true
   if [ -d "$TARGET" ]; then
-     if docker --version | grep -q podman; then
+     if [ -n "$docker_is_podman" ]; then
         echo -e "\033[31m" >&2
         cat <<'EOF' >&2
 WARNING: `node_modules` contains symlinks, and the support for this in