Skip to content

Commit

Permalink
Merge pull request #327 from etn-ccis/dev
Browse files Browse the repository at this point in the history
Release icons-svg, Release react-native-vector-icons
  • Loading branch information
joebochill authored May 16, 2024
2 parents 62a9418 + c1b1ebd commit 7ede873
Show file tree
Hide file tree
Showing 60 changed files with 9,541 additions and 3,111 deletions.
91 changes: 0 additions & 91 deletions .circleci/config.yml

This file was deleted.

181 changes: 181 additions & 0 deletions .github/workflows/blui-ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,181 @@
name: Build

on:
push:
branches: [ "dev", "master" ]
pull_request:
branches: [ "dev", "master" ]
pull_request_target:
types:
- opened
branches:
- '*/*'

permissions:
pull-requests: write
contents: read

jobs:
prettier_lint:
runs-on: ubuntu-latest

strategy:
matrix:
node-version: [18.x]

steps:
- name: Checkout
uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
cache: 'yarn'
- run: yarn install --immutable
- run: yarn prettier:check
- run: yarn lint

build_test_icons_library:
runs-on: ubuntu-latest

strategy:
matrix:
node-version: [18.x]

steps:
- name: Checkout
uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
cache: 'yarn'
- run: yarn install --immutable
- run: yarn build
- run: yarn test
- run: yarn build-app
working-directory: demos/react-demo
- name: Save icon-font build
uses: actions/upload-artifact@v3
with:
name: icon-font
if-no-files-found: error
path: packages/icon-font
- name: Save svg build
uses: actions/upload-artifact@v3
with:
name: svg
if-no-files-found: error
path: packages/svg
- name: Save rn-vector build
uses: actions/upload-artifact@v3
with:
name: rn-vector
if-no-files-found: error
path: packages/rn-vector
- name: Save mui build
uses: actions/upload-artifact@v3
with:
name: mui
if-no-files-found: error
path: packages/mui

publish_icon_font:
runs-on: ubuntu-latest
if: ${{ github.event_name == 'push' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev') }}
needs: build_test_icons_library
strategy:
matrix:
node-version: [18.x]
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
BRANCH: ${{ github.ref == 'refs/heads/master' && 'master' || 'dev' }}
steps:
- uses: actions/checkout@v4
- name: Download icon font package
uses: actions/download-artifact@v3
with:
name: icon-font
path: packages/icon-font
- uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
registry-url: 'https://registry.npmjs.org'
- run: yarn --immutable
- run: npm run publish:package -- -b ${{env.BRANCH}}
working-directory: packages/icon-font

publish_icons_svg:
runs-on: ubuntu-latest
if: ${{ github.event_name == 'push' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev') }}
needs: build_test_icons_library
strategy:
matrix:
node-version: [18.x]
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
BRANCH: ${{ github.ref == 'refs/heads/master' && 'master' || 'dev' }}
steps:
- uses: actions/checkout@v4
- name: Download icons svg package
uses: actions/download-artifact@v3
with:
name: svg
path: packages/svg
- uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
registry-url: 'https://registry.npmjs.org'
- run: yarn --immutable
- run: npm run publish:package -- -b ${{env.BRANCH}}
working-directory: packages/svg

publish_icons_mui:
runs-on: ubuntu-latest
if: ${{ github.event_name == 'push' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev') }}
needs: build_test_icons_library
strategy:
matrix:
node-version: [18.x]
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
BRANCH: ${{ github.ref == 'refs/heads/master' && 'master' || 'dev' }}
steps:
- uses: actions/checkout@v4
- name: Download icons mui package
uses: actions/download-artifact@v3
with:
name: mui
path: packages/mui
- uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
registry-url: 'https://registry.npmjs.org'
- run: yarn --immutable
- run: npm run publish:package -- -b ${{env.BRANCH}}
working-directory: packages/mui

publish_rn_vector_icons:
runs-on: ubuntu-latest
if: ${{ github.event_name == 'push' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev') }}
needs: build_test_icons_library
strategy:
matrix:
node-version: [18.x]
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
BRANCH: ${{ github.ref == 'refs/heads/master' && 'master' || 'dev' }}
steps:
- uses: actions/checkout@v4
- name: Download rn-vector package
uses: actions/download-artifact@v3
with:
name: rn-vector
path: packages/rn-vector
- uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
registry-url: 'https://registry.npmjs.org'
- run: yarn --immutable
- run: npm run publish:package -- -b ${{env.BRANCH}}
working-directory: packages/rn-vector
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
/node_modules
**/**/node_modules
**/**/package-lock.json
**/**/material-design-icons

# cache
.yarn/cache
Expand Down
1 change: 1 addition & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ plugins:
spec: "@yarnpkg/plugin-workspace-tools"

yarnPath: .yarn/releases/yarn-3.3.0.cjs
enableStrictSsl: false
16 changes: 8 additions & 8 deletions demos/react-demo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,18 @@
"private": true,
"dependencies": {
"@brightlayer-ui/colors": "^3.1.1",
"@brightlayer-ui/icons": "2.3.0",
"@brightlayer-ui/icons": "2.4.0-alpha.0",
"@brightlayer-ui/icons-mui": "3.6.0",
"@brightlayer-ui/icons-svg": "1.14.0",
"@brightlayer-ui/icons-svg": "1.15.0",
"@brightlayer-ui/react-components": "^6.2.0",
"@brightlayer-ui/react-native-vector-icons": "^2.0.0",
"@brightlayer-ui/react-themes": "^7.0.0",
"@emotion/css": "^11.10.5",
"@emotion/react": "^11.10.8",
"@emotion/styled": "^11.10.5",
"@mui/icons-material": "^5.10.14",
"@mui/material": "^5.10.17",
"@mui/styles": "^5.10.14",
"@mui/icons-material": "5.15.2",
"@mui/material": "5.15.15",
"@mui/styles": "^5.15.7",
"react": "^18.2.0",
"react-app-polyfill": "^3.0.0",
"react-dom": "^18.2.0",
Expand Down Expand Up @@ -60,12 +60,12 @@
"@testing-library/user-event": "^14.4.3",
"@types/jest": "^29.4.0",
"@types/node": "^18.0.0",
"@types/react": "^18.0.25",
"@types/react-dom": "^18.0.9",
"@types/react": "18.2.48",
"@types/react-dom": "^18.2.18",
"@types/react-router-dom": "^5.3.3",
"@typescript-eslint/eslint-plugin": "^5.57.0",
"@typescript-eslint/parser": "^6.16.0",
"eslint": "^8.28.0",
"eslint": "^8.57.0",
"eslint-config-prettier": "^8.5.0",
"eslint-plugin-react": "^7.32.2",
"prettier": "^3.2.5",
Expand Down
12 changes: 12 additions & 0 deletions demos/react-demo/src/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,18 @@ import reportWebVitals from './reportWebVitals';
import './index.css';
import '@brightlayer-ui/icons/BrightlayerUIIcons.css';

// TODO: Remove this after the issues with @types/react goes away
// https://github.com/DefinitelyTyped/DefinitelyTyped/discussions/68444
/* eslint-disable */
declare global {
namespace React {
interface DOMAttributes<T> {
placeholder?: string | undefined;
}
}
}
/* eslint-enable */

const container = document.getElementById('root');
if (!container) throw new Error('Root Element was not found in the DOM');

Expand Down
4 changes: 2 additions & 2 deletions packages/icon-font/PUBLISHING.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## Automatic Publishing

This package is published to NPM automatically by CircleCI when code is merged into the `dev` or `master` branches. To publish a new version, simply update the version in `package.json` and merge your code into the appropriate branch.
This package is published to NPM automatically by Github when code is merged into the `dev` or `master` branches. To publish a new version, simply update the version in `package.json` and merge your code into the appropriate branch.

- The `dev` branch will publish versions marked as `alpha` or `beta`.
- The `master` branch will publish any version (`alpha`, `beta`, or `latest`).
Expand All @@ -26,4 +26,4 @@ yarn build
npm adduser && yarn publish:package
```

> Publishing manually should only be done for `alpha` or `beta` packages. The command will work for `latest` packages, but this should be avoided except in rare situations where the automatic publishing functionality is not working in CircleCI.
> Publishing manually should only be done for `alpha` or `beta` packages. The command will work for `latest` packages, but this should be avoided except in rare situations where the automatic publishing functionality is not working in Github.
2 changes: 1 addition & 1 deletion packages/icon-font/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Brightlayer UI Supplemental Icons

[![](https://img.shields.io/npm/v/@brightlayer-ui/icons.svg?label=@brightlayer-ui/icons&style=flat)](https://www.npmjs.com/package/@brightlayer-ui/icons)
[![](https://img.shields.io/circleci/project/github/etn-ccis/blui-icons/master.svg?style=flat)](https://circleci.com/gh/etn-ccis/blui-icons/tree/master)
[![Build](https://github.com/etn-ccis/blui-icons/actions/workflows/blui-ci.yml/badge.svg?branch=master)](https://github.com/etn-ccis/blui-icons/actions/workflows/blui-ci.yml)

This is a library of supplemental icons, to be used in conjunction with the standard Material Design icons in Brightlayer UI applications.

Expand Down
Loading

0 comments on commit 7ede873

Please sign in to comment.