Skip to content
This repository has been archived by the owner on Feb 22, 2023. It is now read-only.

Commit

Permalink
Merge branch 'main' into ci/pipelines
Browse files Browse the repository at this point in the history
* main:
  Replace PDM logo (#411)
  Add playwright e2e tests (#394)
  Update breakpoints to the new Tailwind config (#408)
  Create a global audio player (amongst many smaller improvements) (#399)
  Create Skeleton components (#392)
  Tailwind breakpoints (#403)
  Avoid error using only local translation files (#367)
  Add base Button component (#372)
  Use Tailwind RTL styles everywhere (#355)
  Add a dependencies section and remove the redundant title (#379)
  🔄 Synced file(s) with WordPress/openverse (#384)
  Fix filters not being set on SSR (#386)
  • Loading branch information
rbadillap committed Nov 12, 2021
2 parents 0b779c5 + f8fb6f0 commit 513582f
Show file tree
Hide file tree
Showing 90 changed files with 4,121 additions and 2,625 deletions.
3 changes: 1 addition & 2 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ module.exports = {
env: {
browser: true,
node: true,
'cypress/globals': true,
},
parserOptions: {
parser: 'babel-eslint',
Expand All @@ -18,7 +17,7 @@ module.exports = {
'plugin:@intlify/vue-i18n/recommended',
],
// required to lint *.vue files
plugins: ['vue', 'cypress', 'vuejs-accessibility', 'unicorn'],
plugins: ['vue', 'vuejs-accessibility', 'unicorn'],
// add your custom rules here
rules: {
semi: [2, 'never'],
Expand Down
8 changes: 4 additions & 4 deletions .github/ISSUE_TEMPLATE/component_spec.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,9 @@
name: Component spec
about: Describe a new component to be developed for the design system
labels: "🕹 aspect: interface, 🌟 goal: addition, 🚦 status: awaiting triage, 🟨 priority: medium"
title: "<Replace this with the component name>"
title: "Component: <Replace this with the component name>"
---

## Component: Title
<!-- Replace 'Title' above with the actual component title. -->

## Description
<!-- Describe the component, including different states. Do not include screenshots. -->

Expand Down Expand Up @@ -43,6 +40,9 @@ title: "<Replace this with the component name>"
## Code samples
<!-- Share pseudocode templates or high-level implementation code; or delete the section entirely. -->

## Dependencies
<!-- Name the components that this component depends on, including issues or PRs; or delete the section entirely if the component is independent. -->

## References
<!-- Include as many references to prior art as you deem necessary or helpful. -->

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,4 @@ jobs:
run: npm run format:test

- name: Run tests
run: npm run test:unit
run: npm run i18n:get-translations && npm run test:unit
4 changes: 2 additions & 2 deletions .github/workflows/pr_ping.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ jobs:
send_message:
name: Send message
if: |
${{ github.event.pull_request.user.login != 'dependabot[bot]' }} &&
${{ !startsWith(github.event.pull_request.title, '🔄') }}
github.actor != 'dependabot[bot]' &&
!startsWith(github.event.pull_request.title, '🔄')
runs-on: ubuntu-latest
steps:
- name: Send Slack notification
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,4 @@ src/locales/*.json
.nuxt-storybook
storybook-static
.vercel
/src/locales/scripts/valid-locales.json
10 changes: 10 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,16 @@ You can run the unit tests by executing:
npm run test
```

To run the e2e tests, run:

```bash
npm run test:e2e
```

You might have to run `npx playwright install` to get the browsers installed if e2e tests fail.

When writing e2e tests, you can also use `npm run generate-e2e-tests` to generate tests and test selectors.

### localhost tunneling

If you want to make your local development server accessible to the internet (for testing or showing someone something you're working on), you can use [`ngrok`](https://ngrok.com/). Follow the documentation on the `ngrok` site to install it and set it up. Once you have it installed, get the development server for Openverse running and in a separate window/tab, run:
Expand Down
5 changes: 0 additions & 5 deletions cypress.json

This file was deleted.

5 changes: 0 additions & 5 deletions cypress/fixtures/example.json

This file was deleted.

23 changes: 0 additions & 23 deletions cypress/plugins/index.js

This file was deleted.

25 changes: 0 additions & 25 deletions cypress/support/commands.js

This file was deleted.

20 changes: 0 additions & 20 deletions cypress/support/index.js

This file was deleted.

5 changes: 5 additions & 0 deletions jest.config.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
module.exports = {
globals: {
'vue-jest': {
experimentalCSSCompile: false,
},
},
moduleFileExtensions: ['js', 'vue', 'json'],
moduleNameMapper: {
'^@/(.*)$': '<rootDir>/src/$1',
Expand Down
3 changes: 2 additions & 1 deletion nuxt.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ export default {
'~/components/MediaInfo',
'~/components/MetaSearch',
'~/components/MediaTag',
'~/components/Skeleton',
],
},
plugins: [
Expand Down Expand Up @@ -166,9 +167,9 @@ export default {
},
modules: [
'@nuxtjs/sentry',
'@nuxtjs/sitemap',
'nuxt-ssr-cache',
'@nuxtjs/i18n',
'@nuxtjs/sitemap',
],
i18n: {
locales: [
Expand Down
Loading

0 comments on commit 513582f

Please sign in to comment.