Skip to content

Commit

Permalink
Merge release/3.0.0 into develop branch (#1216)
Browse files Browse the repository at this point in the history
Updates Node 20, React 18, Yarn 4

Removes the following which have been marked as deprecated:
1. Alert announcement type
2. Button danger and warning variants
3. DropdownToggle overrides of the above Button variants
4. Remove Sass vars represented as CSS Properties

Also upgrades: 
- babel & storybook
- font awesome
- yarn
- eslint and minor upgrades
- react-dom
- react-toggle

---------

Co-authored-by: Kyle Shike <[email protected]>
Co-authored-by: Jeff Baxendale <[email protected]>
Co-authored-by: Gabe Scarbrough <[email protected]>
  • Loading branch information
4 people authored May 4, 2024
1 parent 2cb9e42 commit 66e414f
Show file tree
Hide file tree
Showing 109 changed files with 18,531 additions and 14,525 deletions.
4 changes: 3 additions & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,9 @@
{
"files": "**/*.{ts,tsx}",
"rules": {
"react/require-default-props": "off"
"react/require-default-props": "off",
"no-shadow": "off",
"@typescript-eslint/no-shadow": "error",
}
}
],
Expand Down
29 changes: 18 additions & 11 deletions .github/workflows/chromatic.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# .github/workflows/chromatic.yml

# Workflow name
name: 'Chromatic build on main'
name: "Chromatic build on main"

# Event for the workflow
on:
Expand All @@ -14,17 +14,24 @@ jobs:
chromatic-deployment:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
with:
fetch-depth: 0 # 👈 Required to retrieve git history
- uses: actions/setup-node@v3
- name: Checkout branch
uses: actions/checkout@v4

- name: Setup Node
uses: actions/setup-node@v4
with:
node-version-file: '.node-version'
- run: |
npm config set "@fortawesome:registry" https://npm.fontawesome.com/
npm config set "//npm.fontawesome.com/:_authToken" ${{ secrets.FONTAWESOME_NPM_AUTH_TOKEN }}
- run: yarn
node-version-file: ".node-version"

- name: Setup Yarn
uses: volta-cli/action@v4

- name: Setup env
run: echo "FONTAWESOME_NPM_AUTH_TOKEN=${{ secrets.FONTAWESOME_NPM_AUTH_TOKEN }}" > .env

- name: Install dependencies
run: yarn install

- name: Publish to Chromatic
uses: chromaui/action@v1
uses: chromaui/action@latest
with:
projectToken: ${{ secrets.CHROMATIC_PROJECT_TOKEN }}
26 changes: 17 additions & 9 deletions .github/workflows/create-new-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,24 +7,32 @@ jobs:
name: Create new release
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v3
- name: Checkout branch
uses: actions/checkout@v4

- name: Setup Node
uses: actions/setup-node@v4
with:
node-version-file: '.node-version'
- run: |
npm config set "@fortawesome:registry" https://npm.fontawesome.com/
npm config set "//npm.fontawesome.com/:_authToken" ${{ secrets.FONTAWESOME_NPM_AUTH_TOKEN }}
- run: yarn install
node-version-file: ".node-version"

- name: Setup Yarn
uses: volta-cli/action@v4

- name: Setup env
run: echo "FONTAWESOME_NPM_AUTH_TOKEN=${{ secrets.FONTAWESOME_NPM_AUTH_TOKEN }}" > .env

- name: Install dependencies
run: yarn install

- name: Initialize mandatory git config
uses: fregante/setup-git-user@v1
uses: fregante/setup-git-user@v2

# Build assets
- run: yarn build
- run: npm pack
- name: Extract Package Version
id: extract_version
uses: Saionaro/extract-package-version@v1.1.1
uses: Saionaro/extract-package-version@v1.2.1

- name: Create Release
id: create_release
Expand Down
94 changes: 48 additions & 46 deletions .github/workflows/gh-pages-deploy.yml
Original file line number Diff line number Diff line change
@@ -1,46 +1,48 @@
name: Deploy to github pages
on:
workflow_dispatch:
push:
branches:
- main

# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
permissions:
contents: read
pages: write
id-token: write

jobs:
gh-pages-deploy:
name: Deploying to gh-pages
runs-on: ubuntu-latest
steps:
- name: Checkout branch
uses: actions/checkout@v3

- name: Setup node
uses: actions/setup-node@v3
with:
node-version-file: '.node-version'
cache: 'yarn'

- name: Configure npm
run: npm config set "@fortawesome:registry" https://npm.fontawesome.com/ &&
npm config set "//npm.fontawesome.com/:_authToken" ${{ secrets.FONTAWESOME_NPM_AUTH_TOKEN }}

- name: Install dependencies
run: yarn install

- name: Build
run: yarn build-storybook

- name: Upload
uses: actions/upload-pages-artifact@v3
with:
path: 'storybook-static'

- name: Deploy
uses: actions/deploy-pages@v4
with:
token: ${{ github.token }}
name: Deploy to github pages
on:
workflow_dispatch:
push:
branches:
- main

# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
permissions:
contents: read
pages: write
id-token: write

jobs:
gh-pages-deploy:
name: Deploying to gh-pages
runs-on: ubuntu-latest
steps:
- name: Checkout branch
uses: actions/checkout@v4

- name: Setup node
uses: actions/setup-node@v4
with:
node-version-file: ".node-version"
cache: "yarn"

- name: Setup Yarn
uses: volta-cli/action@v4

- name: Setup env
run: echo "FONTAWESOME_NPM_AUTH_TOKEN=${{ secrets.FONTAWESOME_NPM_AUTH_TOKEN }}" > .env

- name: Install dependencies
run: yarn install

- name: Build
run: yarn build-storybook

- name: Upload
uses: actions/upload-pages-artifact@v4
with:
path: "storybook-static"

- name: Deploy
uses: actions/deploy-pages@v4
with:
token: ${{ github.token }}
26 changes: 18 additions & 8 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,22 @@ jobs:
js-lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v3
- name: Checkout branch
uses: actions/checkout@v4

- name: Setup Node
uses: actions/setup-node@v4
with:
node-version-file: '.node-version'
- run: |
npm config set "@fortawesome:registry" https://npm.fontawesome.com/
npm config set "//npm.fontawesome.com/:_authToken" ${{ secrets.FONTAWESOME_NPM_AUTH_TOKEN }}
- run: yarn
- run: yarn lint
node-version-file: ".node-version"

- name: Setup Yarn
uses: volta-cli/action@v4

- name: Setup env
run: echo "FONTAWESOME_NPM_AUTH_TOKEN=${{ secrets.FONTAWESOME_NPM_AUTH_TOKEN }}" > .env

- name: Install dependencies
run: yarn install

- name: Lint
run: yarn lint
20 changes: 14 additions & 6 deletions .github/workflows/prepare-hotfix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,26 +4,35 @@ on:
workflow_dispatch:
inputs:
version:
description: 'The version you want to release.'
description: "The version you want to release."
required: true

jobs:
prepare-hotfix:
name: Prepare hotfix
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Checkout branch
uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: actions/setup-node@v3

- name: Setup Node
uses: actions/setup-node@v4
with:
node-version-file: '.node-version'
node-version-file: ".node-version"

- name: Setup Yarn
uses: volta-cli/action@v4

- name: Setup env
run: echo "FONTAWESOME_NPM_AUTH_TOKEN=${{ secrets.FONTAWESOME_NPM_AUTH_TOKEN }}" > .env

- name: Create hotfix branch
run: git checkout -b hotfix/${{ github.event.inputs.version }}

- name: Initialize mandatory git config
uses: fregante/setup-git-user@v1
uses: fregante/setup-git-user@v2

- name: Bump version in package.json
run: yarn version --new-version ${{ github.event.inputs.version }} --no-git-tag-version
Expand Down Expand Up @@ -56,4 +65,3 @@ jobs:
head: hotfix/${{ github.event.inputs.version }}
base: develop
title: Merge hotfix/${{ github.event.inputs.version }} into develop branch

22 changes: 15 additions & 7 deletions .github/workflows/prepare-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,29 +4,38 @@ on:
workflow_dispatch:
inputs:
version:
description: 'The version you want to release.'
description: "The version you want to release."
required: true

jobs:
prepare-release:
name: Prepare release
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Checkout branch
uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: actions/setup-node@v3

- name: Setup Node
uses: actions/setup-node@v4
with:
node-version-file: '.node-version'
node-version-file: ".node-version"

- name: Setup Yarn
uses: volta-cli/action@v4

- name: Setup env
run: echo "FONTAWESOME_NPM_AUTH_TOKEN=${{ secrets.FONTAWESOME_NPM_AUTH_TOKEN }}" > .env

- name: Create release branch
run: git checkout -b release/${{ github.event.inputs.version }}

- name: Initialize mandatory git config
uses: fregante/setup-git-user@v1
uses: fregante/setup-git-user@v2

- name: Bump version in package.json
run: yarn version --new-version ${{ github.event.inputs.version }} --no-git-tag-version
run: yarn version ${{ github.event.inputs.version }}

- name: Commit manifest files
id: make-commit
Expand Down Expand Up @@ -56,4 +65,3 @@ jobs:
head: release/${{ github.event.inputs.version }}
base: develop
title: Merge release/${{ github.event.inputs.version }} into develop branch

26 changes: 18 additions & 8 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,22 @@ jobs:
js-test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v3
- name: Checkout branch
uses: actions/checkout@v4

- name: Setup Node
uses: actions/setup-node@v4
with:
node-version-file: '.node-version'
- run: |
npm config set "@fortawesome:registry" https://npm.fontawesome.com/
npm config set "//npm.fontawesome.com/:_authToken" ${{ secrets.FONTAWESOME_NPM_AUTH_TOKEN }}
- run: yarn
- run: yarn test
node-version-file: ".node-version"

- name: Setup Yarn
uses: volta-cli/action@v4

- name: Setup env
run: echo "FONTAWESOME_NPM_AUTH_TOKEN=${{ secrets.FONTAWESOME_NPM_AUTH_TOKEN }}" > .env

- name: Install dependencies
run: yarn install

- name: Test
run: yarn test
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,12 @@ lib
.env.test.local
.env.production.local
.npmrc
.yarn
.env

# Ignore Jetbrains IDE settings
/.idea
/.vscode

npm-debug.log*
yarn-debug.log*
Expand Down
2 changes: 1 addition & 1 deletion .node-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
18.18.2
20.12.1
2 changes: 1 addition & 1 deletion .storybook/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const config = {
configFile: true
}
}
}, '@storybook/addon-a11y', '@storybook/addon-actions', '@storybook/addon-backgrounds', '@storybook/addon-controls', '@storybook/addon-links', '@storybook/addon-storysource', '@storybook/addon-mdx-gfm', '@storybook/addon-webpack5-compiler-babel', ({
}, '@storybook/addon-a11y', '@storybook/addon-actions', '@storybook/addon-backgrounds', '@storybook/addon-controls', '@storybook/addon-links', '@storybook/addon-storysource', '@storybook/addon-webpack5-compiler-babel', ({
name: "@storybook/addon-styling-webpack",

options: {
Expand Down
2 changes: 1 addition & 1 deletion .storybook/manager.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { addons } from '@storybook/addons';
import { addons } from '@storybook/manager-api';

import userInterviewsTheme from './user-interviews-theme';

Expand Down
Loading

0 comments on commit 66e414f

Please sign in to comment.