Skip to content

Commit

Permalink
Merge pull request #763 from xeroxinteractive/next
Browse files Browse the repository at this point in the history
Mobile filters + dependency updates
  • Loading branch information
AndrewLeedham authored Jul 14, 2023
2 parents d23f7c8 + 2b6706d commit c4830b5
Show file tree
Hide file tree
Showing 96 changed files with 69,139 additions and 34,398 deletions.
1 change: 1 addition & 0 deletions .browserslistrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
"current node"
11 changes: 0 additions & 11 deletions .editorconfig

This file was deleted.

19 changes: 19 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"root": true,
"extends": ["@xerox"],
"ignorePatterns": ["**/*"],
"overrides": [
{
"files": "*.{cjs,js,mjs}",
"rules": {}
},
{
"files": "*.ts",
"extends": ["@xerox/eslint-config/typescript"]
},
{
"files": "*.test.{cjs,js,mjs,ts}",
"extends": ["@xerox/eslint-config/jest"]
}
]
}
11 changes: 0 additions & 11 deletions .github/dependabot.yml

This file was deleted.

35 changes: 31 additions & 4 deletions .github/labels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,10 @@
color: 0052cc
- name: bug
description: fixes a bug and should be reviewed ASAP
color: ff9600
color: b54f0b
- name: cron
description: generated by a CI cron job
color: 226e7f
- name: dependencies
description: related to dependencies
color: fcf3b8
- name: work in progress
description: being worked on
color: edcd39
Expand All @@ -32,3 +29,33 @@
- name: enhancement
description: adds a new feature or improves on an existing one
color: ad12cc
- name: 'change: major'
description: A major breaking change
color: fcf3b8
- name: 'change: feature'
description: Adds a new feature or improves on an existing one
color: fcf3b8
- name: 'change: fix'
description: Fixes a bug
color: fcf3b8
- name: 'change: documentation'
description: Changes only affect the documentation
color: fcf3b8
- name: 'change: refactor'
description: Changes that introduce no new features or fixes
color: fcf3b8
- name: 'change: performance'
description: Improve performance of an existing feature
color: fcf3b8
- name: 'change: dependencies'
description: Updates to dependencies only
color: fcf3b8
- name: 'change: tests'
description: Add or improve existing tests
color: 696969
- name: 'change: chore'
description: Changes around build process
color: 696969
- name: 'release'
description: Create a release when this pr is merged
color: 067314
31 changes: 31 additions & 0 deletions .github/workflows/check.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
on:
push:
branches:
- '**'

name: Check

jobs:
check:
runs-on: ubuntu-latest

strategy:
matrix:
node-version: [14.x, 16.x, 18.x]

steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0
- uses: nrwl/nx-set-shas@v3
with:
main-branch-name: 'next'
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
- uses: bahmutov/npm-install@v1
- run: yarn global add nx
- run: nx affected:lint
- run: nx affected:test
- run: nx affected:build
69 changes: 21 additions & 48 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,65 +2,38 @@ on:
push:
branches:
- release
- next

name: Publish

jobs:
test:
runs-on: ubuntu-latest
if: "! contains(toJSON(github.event.commits.*.message), '[skip-ci]')"

strategy:
matrix:
node-version: [10.x, 12.x, 14.x]

steps:
- uses: actions/checkout@v2
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
- uses: actions/checkout@v3
with:
node-version: ${{ matrix.node-version }}
- name: Get yarn cache directory path
id: yarn-cache-dir-path
run: echo "::set-output name=dir::$(yarn cache dir)"
- uses: actions/cache@v2
id: yarn-cache
ssh-key: ${{ secrets.SSH_PRIVATE_KEY }}
- name: Prepare repository
run: git fetch --unshallow --tags
- uses: nrwl/nx-set-shas@v3
with:
path: |
node_modules
key: ${{ matrix.node-version}}-${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
- run: yarn install
- run: yarn lint
- run: yarn type-check
- run: yarn test

publish:
needs: test
runs-on: ubuntu-latest
if: "! contains(toJSON(github.event.commits.*.message), '[skip-ci]')"

steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
main-branch-name: 'next'
- uses: actions/setup-node@v3
with:
node-version: 14
- name: Get yarn cache directory path
id: yarn-cache-dir-path
run: echo "::set-output name=dir::$(yarn cache dir)"
- uses: actions/cache@v2
id: yarn-cache
with:
path: |
node_modules
key: 14-${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
- uses: webfactory/ssh-agent@v0.4.1
with:
ssh-private-key: ${{secrets.SSH_PRIVATE_KEY}}
- run: yarn install
- name: Deploy
node-version: 16.x
- uses: bahmutov/npm-install@v1
- run: yarn global add nx
- run: nx affected:lint
- run: nx affected:test
- run: nx affected:build
- name: Publish to GitHub Packages
if: github.ref == 'refs/heads/release' || github.ref == 'refs/heads/next'
run: |
yarn deploy
echo '{ "version": "independent", "npmClient": "yarn", "packages": [ "packages/dist/*" ] }' > lerna.json
npx auto shipit
env:
NPM_TOKEN: ${{secrets.NPM_TOKEN}}
SLACK_WEBHOOK: ${{secrets.NPM_SLACK_WEBHOOK}}
SLACK_WEBHOOK_URL: ${{secrets.NPM_SLACK_WEBHOOK}}
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
NPM_TOKEN: ${{secrets.NPM_TOKEN}}
NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
2 changes: 1 addition & 1 deletion .github/workflows/sync-labels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- uses: micnncim/action-label-syncer@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down
38 changes: 0 additions & 38 deletions .github/workflows/test.yml

This file was deleted.

7 changes: 5 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -60,5 +60,8 @@ typings/
# next.js build output
.next

# build folder
build/
# dist folder
dist/

# Prevent generated lerna.json from being committed
lerna.json
1 change: 0 additions & 1 deletion .huskyrc.js

This file was deleted.

2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
14
18
3 changes: 1 addition & 2 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"recommendations": [
"esbenp.prettier-vscode",
"dbaeumer.vscode-eslint",
"EditorConfig.editorconfig"
"dbaeumer.vscode-eslint"
]
}
38 changes: 23 additions & 15 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,23 +1,31 @@
// Place your settings in this file to overwrite default and user settings.
{
"search.exclude": {
"node_modules/**/*": true
"editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.formatOnSave": true,
"[javascript]": {
"editor.formatOnSave": false
},
"files.eol": "\n",
"editor.tabSize": 2,
"editor.detectIndentation": false,
"[typescript]": {
"editor.formatOnSave": true
"[javascriptreact]": {
"editor.formatOnSave": false
},
"[json]": {
"editor.formatOnSave": true
"[typescript]": {
"editor.formatOnSave": false
},
"[yaml]": {
"editor.formatOnSave": true
"[typescriptreact]": {
"editor.formatOnSave": false
},
"eslint.options": {
"extensions": [".ts"]
"typescript.tsdk": "./node_modules/typescript/lib",
"typescript.enablePromptUseWorkspaceTsdk": true,
"files.eol": "\n",
"editor.tabSize": 2,
"editor.detectIndentation": false,
"editor.codeActionsOnSave": {
"source.fixAll.eslint": true
},
"eslint.validate": ["typescript"],
"typescript.tsdk": "./node_modules/typescript/lib"
"eslint.validate": [
"javascript",
"javascriptreact",
"typescript",
"typescriptreact"
]
}
Loading

0 comments on commit c4830b5

Please sign in to comment.