Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into feature/EX-7088-x-tai…
Browse files Browse the repository at this point in the history
…lwind-showcase

# Conflicts:
#	packages/x-tailwindcss/demo/index.html
#	packages/x-tailwindcss/tsconfig.json
  • Loading branch information
javieri-empathy committed Nov 3, 2022
2 parents 68e4c59 + 8d48760 commit 56ea836
Show file tree
Hide file tree
Showing 149 changed files with 3,429 additions and 3,828 deletions.
3 changes: 3 additions & 0 deletions .github/contributing/commits.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,18 +52,21 @@ As a starting point, this project uses the following scopes:
- X Modules: If the change only affects one X Module, use the name of the module in `kebab-case`:
- **device**
- **empathize**
- **extra-params**
- **facets**
- **history-queries**
- **identifier-results**
- **next-queries**
- **popular-searches**
- **queries-preview**
- **query-suggestions**
- **recommendations**
- **related-tags**
- **scroll**
- **search**
- **search-box**
- **tagging**
- **url**
- **x-plugin**: For changes that affect the core of the `x-components` project. For example, if you
modify the X Components plugin, the X Components archetype, or the X bus.
- **wiring**: Changes that only affect the wiring operators or wiring factory.
Expand Down
12 changes: 8 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
name: Check branch is releasable and release alpha on main branch update
on: [push, pull_request]
concurrency:
concurrency:
group: ${{ github.workflow }}-${{ github.ref_name }}
cancel-in-progress: true
jobs:
build:
runs-on: ubuntu-latest
container: cypress/browsers:node14.17.0-chrome91-ff89
container:
image: cypress/browsers:node16.16.0-chrome105-ff104-edge
# https://github.com/cypress-io/github-action#firefox Cypress FF image needs this user permissions to be able to install dependencies
options: --user 1001
steps:
- uses: actions/checkout@v3
with:
Expand All @@ -19,9 +22,10 @@ jobs:
- name: Run tests in all packages
run: npm run test
- name: Release alpha on non-release pushes to main branch
if: ${{ github.ref_name == 'main' && github.actor != 'support-empathy' && !startsWith(github.event.head_commit.message, 'chore(release):') }}
if:
${{ github.ref_name == 'main' && github.actor != 'support-empathy' &&
!startsWith(github.event.head_commit.message, 'chore(release):') }}
uses: ./.github/actions/release-alpha
with:
npm_token: ${{ secrets.NPM_TOKEN }}
github_token: ${{ secrets.SUPPORT_TOKEN }}

35 changes: 35 additions & 0 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
# Learn more about CodeQL at https://codeql.github.com/docs/
# Learn more about code scanning at https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/about-code-scanning
#
name: "CodeQL"

on:
push:
branches: [ "main" ]
pull_request:
# The branches below must be a subset of the branches above
branches: [ "main" ]
schedule:
# Runs periodically at 00:00 UTC on Monday
- cron: '00 00 * * 1'

jobs:
analyze:
name: Analyze
runs-on: ubuntu-latest
permissions:
security-events: write

strategy:
fail-fast: false

steps:
- name: Checkout repository
uses: actions/checkout@v3

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
5 changes: 4 additions & 1 deletion .github/workflows/prepare-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@ on: [workflow_dispatch]
jobs:
prepare-release:
runs-on: ubuntu-latest
container: cypress/browsers:node14.17.0-chrome91-ff89
container:
image: cypress/browsers:node16.16.0-chrome105-ff104-edge
# https://github.com/cypress-io/github-action#firefox Cypress FF image needs this user permissions to be able to install dependencies
options: --user 1001
steps:
- uses: actions/checkout@v3
with:
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/publish-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@ jobs:
release:
if: github.event.pull_request.merged == true && github.head_ref == 'release'
runs-on: ubuntu-latest
container: cypress/browsers:node14.17.0-chrome91-ff89
container:
image: cypress/browsers:node16.16.0-chrome105-ff104-edge
# https://github.com/cypress-io/github-action#firefox Cypress FF image needs this user permissions to be able to install dependencies
options: --user 1001
steps:
- uses: actions/checkout@v3
with:
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/release-alpha.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@ on: [workflow_dispatch]
jobs:
release-alpha:
runs-on: ubuntu-latest
container: cypress/browsers:node14.17.0-chrome91-ff89
container:
image: cypress/browsers:node16.16.0-chrome105-ff104-edge
# https://github.com/cypress-io/github-action#firefox Cypress FF image needs this user permissions to be able to install dependencies
options: --user 1001
steps:
- uses: actions/checkout@v3
with:
Expand Down
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
.eslintcache
.DS_Store
.parcel-cache
**/node_modules
**/dist
**/docs
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,8 @@ We are working on many key features to consolidate Interface X, including these
- Create the [x-adapter](https://github.com/empathyco/x/tree/main/packages/x-adapter) to connect to
any Search API based on schemas
[![Release Docs](https://img.shields.io/badge/Released-April%202022-brightgreen)](https://docs.empathy.co)
- [My History](https://empathy.co/blog/development-journey-my-history/) feature, Control your search
history and have access to previous intentions.
- [My History](https://docs.empathy.co/explore-empathy-platform/experience-search-and-discovery/my-history.html)
feature, Control your search history and have access to previous intentions.
[![Release Docs](https://img.shields.io/badge/Released-July%202022-brightgreen)](https://empathy.co/blog/development-journey-my-history/)
- Use [accessibility eslint plugin](https://github.com/vue-a11y/eslint-plugin-vuejs-accessibility)
to improve components a11y.
Expand All @@ -107,7 +107,7 @@ We are working on many key features to consolidate Interface X, including these
- Query Results Preview: Provides a list of results matching a query to be inserted before the
shopper starts typing as inspiration, in the predictive layer for results matching the current
query, or as inspiration in a no results scenario.
[![Release Docs](https://img.shields.io/badge/In%20Progress-Q3%202022-yellow)](https://github.com/empathyco/x/tree/main/packages/x-tailwindcss)
[![Release Docs](https://img.shields.io/badge/Released-September%202022-brightgreen)](https://docs.empathy.co/develop-empathy-platform/build-search-ui/web-archetype-integration-guide.html#setting-up-the-queries-preview-dynamically)
- Design System Builder POC using Tailwind.
[![Release Docs](https://img.shields.io/badge/In%20Progress-Q3%202022-yellow)](https://github.com/empathyco/x/tree/main/packages/x-tailwindcss)
- WCAG AA compliance.
Expand Down Expand Up @@ -151,7 +151,7 @@ the future of search experiences, please check our
| <a href="https://github.com/tajespasarela"><img src="https://avatars.githubusercontent.com/u/5759712?v=4" width="100px;" alt=""/><br /><br /><b>Iván Tajes</b></a> | <a href="https://github.com/javieri-empathy"><img src="https://avatars.githubusercontent.com/u/68222542?v=4" width="100px;" alt=""/><br /><br /><b>Javier Iglesias</b></a> | <a href="https://github.com/joseacabaneros"><img src="https://avatars.githubusercontent.com/u/10746604?v=4" width="100px;" alt=""/><br /><br /><b>Jose Antonio Cabañeros</b></a> | <a href="https://github.com/LuisMartinez15"><img src="https://avatars.githubusercontent.com/u/6247440?v=4" width="100px;" alt=""/><br /><br /><b>Luís Martínez</b></a> | <a href="https://github.com/tiborux"><img src="https://avatars.githubusercontent.com/u/6597815?v=4" width="100px;" alt=""/><br /><br /><b>Beltrán García</b></a> |
| :-----------------------------------------------------------------------------------------------------------------------------------------------------------------: | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :--------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------: |
| <a href="https://github.com/herrardo"><img src="https://avatars.githubusercontent.com/u/4663897?v=4" width="100px;" alt=""/><br /><br /><b>Gerardo Vázquez</b></a> | <a href="https://github.com/CachedaCodes"><img src="https://avatars.githubusercontent.com/u/7124620?v=4" width="100px;" alt=""/><br /><br /><b>Guillermo Cacheda</b></a> | <a href="https://github.com/mavmaf"><img src="https://avatars.githubusercontent.com/u/77147901?v=4" width="100px;" alt=""/><br /><br /><b>Mavi Fernández</b></a> | <a href="https://github.com/diegopf"><img src="https://avatars.githubusercontent.com/u/7504736?v=4" width="100px;" alt=""/><br /><br /><b>Diego Pascual</b></a> | <a href="https://github.com/mnavarroespinosa"><img src="https://avatars.githubusercontent.com/u/77450928?v=4" width="100px;" alt=""/><br /><br /><b>Manuel Navarro</b></a> |
| <a href="https://github.com/ajperezbau"><img src="https://avatars.githubusercontent.com/u/75546736?v=4" width="100px;" alt=""/><br /><br /><b>Abraham Pérez</b></a> |
| <a href="https://github.com/ajperezbau"><img src="https://avatars.githubusercontent.com/u/75546736?v=4" width="100px;" alt=""/><br /><br /><b>Abraham Pérez</b></a> | <a href="https://github.com/annacv"><img src="https://avatars.githubusercontent.com/u/21217131?v=4" width="100px;" alt=""/><br /><br /><b>Anna Condal</b></a> | <a href="https://github.com/alvarodE"><img src="https://avatars.githubusercontent.com/u/72568818?v=4" width="100px;" alt=""/><br /><br /><b>Álvaro Díaz</b></a> |

## Contributors

Expand Down
Loading

0 comments on commit 56ea836

Please sign in to comment.