Skip to content

Commit

Permalink
Merge pull request #236 from pxblue/dev
Browse files Browse the repository at this point in the history
New SB Image
  • Loading branch information
jeffvg authored Dec 17, 2021
2 parents 3722cf0 + cccb63c commit 437906b
Show file tree
Hide file tree
Showing 28 changed files with 234 additions and 217 deletions.
20 changes: 12 additions & 8 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ jobs:
build_library:
docker:
- image: circleci/node:14.17-browsers
resource_class: large
steps:
- checkout
- restore_cache:
Expand Down Expand Up @@ -73,6 +74,7 @@ jobs:
build_storybook:
docker:
- image: circleci/node:12.9.1-browsers
resource_class: large
environment:
- MASTER_BRANCH: master
- DEV_BRANCH: dev
Expand Down Expand Up @@ -121,6 +123,7 @@ jobs:
build_storybook_api:
docker:
- image: circleci/node:12.9.1-browsers
resource_class: large
environment:
- MASTER_BRANCH: master
- DEV_BRANCH: dev
Expand Down Expand Up @@ -183,15 +186,16 @@ jobs:
build_showcase:
docker:
- image: circleci/node:12.9.1-browsers
resource_class: large
environment:
- MASTER_BRANCH: master
steps:
- checkout
- attach_workspace:
at: .
- run:
name: 'Set Max Memory'
command: NODE_OPTIONS=--max_old_space_size=2048
# - run:
# name: 'Set Max Memory'
# command: NODE_OPTIONS=--max_old_space_size=2048
- run:
name: 'Initialize Submodule'
command: yarn initialize
Expand Down Expand Up @@ -303,13 +307,13 @@ workflows:
- build_showcase:
requires:
- build_library
# - build_storybook:
# requires:
# - build_showcase
- build_storybook:
requires:
- build_showcase
- build_storybook_api:
requires:
- build_library
# - build_storybook
- build_storybook
- deploy_storybook:
requires:
- build_storybook_api
Expand All @@ -320,7 +324,7 @@ workflows:
- dev
- publish:
requires:
# - build_storybook
- build_storybook
- build_showcase
- build_storybook_api
filters:
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Change Log

## v6.0.2 (December 17, 2021)

### Changed

- Changed license to Eaton.

## v6.0.1 (November 10, 2021)

### Changed
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
BSD 3-Clause License

Copyright (c) 2020, Power Xpert Blue
Copyright (c) 2021 - Present, Eaton
All rights reserved.

Redistribution and use in source and binary forms, with or without
Expand Down
2 changes: 1 addition & 1 deletion components/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@brightlayer-ui/react-native-components",
"version": "6.0.1",
"version": "6.0.2",
"author": "brightlayer-ui <[email protected]>",
"description": "Reusable React Native components for Brightlayer UI applications",
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion demos/api/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module.exports = {
parser: '@typescript-eslint/parser',
extends: ['@pxblue/eslint-config/tsx'],
extends: ['@brightlayer-ui/eslint-config/tsx'],
parserOptions: {
project: './tsconfig.json',
},
Expand Down
20 changes: 10 additions & 10 deletions demos/api/.storybook/config.js
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
import React from 'react';
import { addDecorator, addParameters } from '@storybook/react';
import { MuiThemeProvider, createMuiTheme } from '@material-ui/core/styles';
import { blue as ReactThemes } from '@pxblue/react-themes';
import * as Colors from '@pxblue/colors';
import '@pxblue/react-themes/open-sans';
import { pxblueTheme } from '@pxblue/storybook-themes';
import { blue as ReactThemes } from '@brightlayer-ui/react-themes';
import * as Colors from '@brightlayer-ui/colors';
import '@brightlayer-ui/react-themes/open-sans';
import { bluiTheme } from '@brightlayer-ui/storybook-themes';
import { CssBaseline } from '@material-ui/core';

pxblueTheme.brandTitle = 'PX Blue React Native Component Library';
pxblueTheme.brandUrl = 'https://pxblue.github.io';
bluiTheme.brandTitle = 'Brightlayer UI React Native Component Library';
bluiTheme.brandUrl = 'https://brightlayer-ui.github.io';
if (window.top.location.hostname === 'localhost') {
pxblueTheme.brandImage = require('../assets/pxblue-react-native-alpha.svg');
bluiTheme.brandImage = require('../assets/brightlayer-ui-react-native-alpha.svg');
} else if (window.top.location.pathname.slice(0, 18) === '/react-native-dev/') {
pxblueTheme.brandImage = require('../assets/pxblue-react-native-beta.svg');
bluiTheme.brandImage = require('../assets/brightlayer-ui-react-native-beta.svg');
} else {
pxblueTheme.brandImage = require('../assets/pxblue-react-native.svg');
bluiTheme.brandImage = require('../assets/brightlayer-ui-react-native.svg');
}

addParameters({
Expand All @@ -23,7 +23,7 @@ addParameters({
markdown: '<div> </div>',
},
options: {
theme: pxblueTheme,
theme: bluiTheme,
showRoots: true,
},
});
Expand Down
2 changes: 1 addition & 1 deletion demos/api/README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Storybook Demo
The storybook demo shows the API documentation for PX Blue React Native components.
The storybook demo shows the API documentation for Brightlayer UI React Native components.

To start the storybook demo, run from the root folder:

Expand Down
File renamed without changes
27 changes: 27 additions & 0 deletions demos/api/assets/brightlayer-ui-react-native-alpha.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 437906b

Please sign in to comment.