fixup! fixup! fixup! front: switch from yarn to npm

OpenRailAssociation · Nov 21, 2024 · ee40939 · ee40939
1 parent e715a27
commit ee40939
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/front/README.md b/front/README.md
@@ -38,7 +38,7 @@ Launches end to end tests.
 
 It requires:
 
-- Install playwright dependencies `cd ./front/ && yarn playwright install --with-deps`
+- Install playwright dependencies `cd ./front/ && npx playwright install --with-deps`
 - Backend containers to be up:
   `docker compose up --no-build --detach valkey postgres gateway core editoast`
 - Running front with `docker compose up --build --detach front`
@@ -48,7 +48,7 @@ Now you can run the test with `cd front/ && npm run e2e-tests`.
 If you are using a Linux distribution not supported by playwright (which only supports Windows,
 macOS and Ubuntu/Debian), you can instead start the tests inside a docker container using
 `osrd/scripts/run-front-playwright-container.sh`. You may pass the same options and arguments to
-this script as you would to `yarn e2e-tests` or `yarn playwright test`.
+this script as you would to `npm run e2e-tests` or `npx playwright test`.
 
 > [!CAUTION] If you try to run `npm run start` instead of running it through docker, you'll notice
 > it doesn't work because the gateway can't access your local port from inside a container. 2

diff --git a/front/docker/Dockerfile.playwright b/front/docker/Dockerfile.playwright
@@ -1,9 +1,9 @@
 ARG PLAYWRIGHT_VERSION=latest
 FROM mcr.microsoft.com/playwright:$PLAYWRIGHT_VERSION
 
-COPY front/package.json front/yarn.lock /app/front/
+COPY front/package.json front/package-lock.json /app/front/
 WORKDIR /app/front
-RUN yarn install --frozen-lockfile
+RUN npm install --frozen-lockfile
 
 COPY front /app/front/
 COPY tests /app/tests

diff --git a/scripts/run-front-playwright-container.sh b/scripts/run-front-playwright-container.sh
@@ -11,7 +11,7 @@ if ! command -v jq &> /dev/null; then
   exit 1
 fi
 cd front
-VERSION=$(yarn list --pattern playwright --json | jq -r '.data.trees[].name | split("@")[-1]' | sort -u)
+VERSION=$(npm list --pattern playwright --json | jq -r '.dependencies["@playwright/test"].version' | sort -u)
 if [ "$(echo "$VERSION" | wc -l)" -ne 1 ]; then
   echo "Error: Zero or multiple playwright versions found: $VERSION" >&2
   exit 1
@@ -40,4 +40,4 @@ docker run -it --rm \
     -v "$PWD/front/playwright-report:/app/front/playwright-report" \
     -v "$PWD/front/test-results:/app/front/test-results" \
     -u "$(stat -c %u:%g .)" \
-    osrd-playwright:latest yarn playwright test "${args[@]}"
+    osrd-playwright:latest npx playwright test "${args[@]}"