Skip to content
This repository was archived by the owner on Feb 22, 2023. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions .github/actions/build/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,6 @@ inputs:
runs:
using: "composite"
steps:
- name: Get pnpm-version
shell: bash
id: pnpm-version
run: |
echo "::set-output name=val::$(cat .pnpm-version)"
shell: bash

# setup docker buildx
- name: setup docker buildx
uses: docker/setup-buildx-action@v1
Expand Down Expand Up @@ -68,8 +61,6 @@ runs:
tags: ${{ steps.metadata_staging.outputs.tags }}
labels: ${{ steps.metadata_staging.outputs.labels }}
push: true
build-args: |
PNPM_VERSION=${{ steps.pnpm-version.outputs.val }}

# for production
# gather metadata from git & github actions to reference in docker
Expand All @@ -95,5 +86,3 @@ runs:
tags: ${{ steps.metadata_production.outputs.tags }}
labels: ${{ steps.metadata_production.outputs.labels }}
push: true
build-args: |
PNPM_VERSION=${{ steps.pnpm-version.outputs.val }}
7 changes: 0 additions & 7 deletions .github/workflows/ghcr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,16 +35,9 @@ jobs:
type=sha
type=ref,event=tag

- name: Get pnpm-version
id: pnpm-version
run: |
echo "::set-output name=val::$(cat .pnpm-version)"

- uses: docker/build-push-action@v2
with:
context: .
tags: ${{ steps.metadata.outputs.tags }}
labels: ${{ steps.metadata.outputs.labels }}
push: true
build-args: |
PNPM_VERSION=${{ steps.pnpm-version.outputs.val }}
1 change: 0 additions & 1 deletion .pnpm-version

This file was deleted.

4 changes: 1 addition & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
FROM node:16-alpine

ARG PNPM_VERSION

RUN npm install -g pnpm@${PNPM_VERSION} pm2@5.2.0
RUN npm install -g pnpm pm2@5.2.0

USER node

Expand Down
3 changes: 1 addition & 2 deletions Dockerfile.playwright
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
ARG PLAYWRIGHT_VERSION
ARG PNPM_VERSION

FROM mcr.microsoft.com/playwright:v${PLAYWRIGHT_VERSION}-focal

RUN npm install -g pnpm@${PNPM_VERSION}
RUN npm install -g pnpm
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ We use [Volta](https://volta.sh/) to manage our local environment tools. Please
Once you have volta installed, manually install `pnpm` using volta. [Volta does not currently officially support `pnpm`](https://github.com/volta-cli/volta/issues/737) so this is a stop gap solution until that support is implemented:

```bash
volta install pnpm@$(cat .pnpm-version)
volta install pnpm
```

Run the following commands in order to have the code up and running on your machine:
Expand Down Expand Up @@ -115,7 +115,7 @@ We do not currently support local development using Docker or `docker-compose`.
However, we do build and actively deploy the frontend using Docker images. If you wish to build the production image for yourself, run the following:

```shell
docker build . --build-arg PNPM_VERSION=$(cat .pnpm-version) -t openverse-frontend:latest
docker build . -t openverse-frontend:latest
```

You can also find the latest `openverse-frontend` images on our [GitHub packages page](https://github.com/WordPress/openverse-frontend/pkgs/container/openverse-frontend).
Expand Down
1 change: 0 additions & 1 deletion bin/playwright.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ export USER_ID=${USER_ID:-$(id -u)}
export PLAYWRIGHT_ARGS=$@
export PLAYWRIGHT_VERSION=$(version)
export TEST_COMMAND=${TEST_COMMAND:-test:playwright:local}
export PNPM_VERSION=$(cat .pnpm-version)

echo Running Playwright v$PLAYWRIGHT_VERSION as $USER_ID with Playwright arguments $PLAYWRIGHT_ARGS

Expand Down
1 change: 0 additions & 1 deletion docker-compose.playwright.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ services:
dockerfile: Dockerfile.playwright
args:
- PLAYWRIGHT_VERSION=${PLAYWRIGHT_VERSION}
- PNPM_VERSION=${PNPM_VERSION}
volumes:
- .:/app
user: ${USER_ID}
Expand Down
27 changes: 24 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@
"dependencies": {
"@nuxt/components": "^2.1.6",
"@nuxt/postcss8": "^1.1.3",
"@nuxt/vue-app": "^2.15.8",
"@nuxtjs/composition-api": "^0.32.0",
"@nuxtjs/i18n": "^7.0.3",
"@nuxtjs/redirect-module": "^0.3.1",
Expand Down Expand Up @@ -91,9 +92,11 @@
"seeded-rand": "^2.0.1",
"throttle-debounce": "^4.0.1",
"uuid": "^8.3.2",
"vue": "^2.6.14",
"vue-i18n": "^8.26.7"
},
"devDependencies": {
"@babel/core": "^7.17.10",
"@babel/eslint-parser": "^7.17.0",
"@babel/preset-typescript": "^7.16.7",
"@babel/runtime-corejs3": "^7.17.9",
Expand All @@ -105,20 +108,23 @@
"@nuxtjs/style-resources": "^1.0.0",
"@pinia/testing": "^0.0.11",
"@playwright/test": "^1.20.2",
"@testing-library/dom": "^8.13.0",
"@testing-library/jest-dom": "^5.16.1",
"@testing-library/user-event": "^13.5.0",
"@testing-library/vue": "^5.8.2",
"@types/express-useragent": "^1.0.2",
"@types/jest": "^26.0.22",
"@types/lodash.sortby": "^4.7.7",
"@types/module-alias": "^2.0.1",
"@types/node": "^17.0.32",
"@types/uuid": "^8.3.4",
"@typescript-eslint/eslint-plugin": "^5.20.0",
"@typescript-eslint/parser": "^5.20.0",
"@vue/runtime-dom": "^3.2.31",
"@vue/test-utils": "^1.1.3",
"autoprefixer": "^10.4.0",
"babel-jest": "^26.6.3",
"babel-loader": "8.2.5",
"eslint": "^8.13.0",
"eslint-config-prettier": "^8.5.0",
"eslint-import-resolver-custom-alias": "^1.3.0",
Expand Down Expand Up @@ -147,11 +153,26 @@
"typescript": "^4.6.2",
"vue-i18n-extract": "^2.0.0",
"vue-jest": "^3.0.7",
"vue-tsc": "^0.34.7"
"vue-template-compiler": "^2.6.14",
"vue-tsc": "^0.34.7",
"webpack": "^4.46.0"
},
"pnpm": {
"peerDependencyRules": {
"ignoreMissing": [
"react",
"react-dom",
"consola"
],
"allowedVersions": {
"babel-core": "7.0.0-bridge.0",
"postcss": "5.2.18"
}
}
Comment on lines +161 to +172
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was looking for something like this but I didn't know what to do with these "peerDependencies", nice!

},
"engines": {
"node": ">= 16.0.0",
"pnpm": ">= 6.24.0"
"node": ">= 16.0.0 <17",
"pnpm": ">= 7.0.1"
},
"browserslist": [
"> 1%",
Expand Down
Loading