Merge pull request #198 from pxblue/dev

Publish 6.1.0

.circleci/config.yml

@@ -31,27 +31,29 @@ jobs:
                     at: .
             -   run:
                     name: Authenticate with registry
-                    command: echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" > ~/.npmrc
+                    command: |
+                        echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" > ~/.npmrc
+                        echo "//registry.yarnpkg.com/:_authToken=$NPM_TOKEN" >> ~/.npmrc            
             -   run:
                     name: Publish @pxblue/angular-themes
                     command:  |
                         cd angular
-                        yarn publish:package
+                        yarn publish:package -b $CIRCLE_BRANCH
             -   run:
                     name: Publish @pxblue/react-themes
                     command:  |
                         cd react
-                        yarn publish:package
+                        yarn publish:package -b $CIRCLE_BRANCH
             -   run:
                     name: Publish @pxblue/react-native-themes
                     command:  |
                         cd react-native
-                        yarn publish:package
+                        yarn publish:package -b $CIRCLE_BRANCH
             -   run:
                     name: Publish @pxblue/storybook-themes
                     command:  |
                         cd storybook
-                        yarn publish:package
+                        yarn publish:package -b $CIRCLE_BRANCH
 workflows:
     version: 2
     themes:
@@ -64,3 +66,4 @@ workflows:
                       branches:
                           only:
                               - master
+                              - dev

CODEOWNERS

@@ -0,0 +1 @@
+*  @emclaug2 @joebochill @huayunh @daileytj

angular/CHANGELOG.md

@@ -1,19 +1,25 @@
 # Changelog
 
-## v6.0.3
+## v6.1.0 (May 28, 2021)
+
+### Added
+
+-   Added support for `<pxb-user-menu>` bottomsheet overlay.
+
+## v6.0.3 (April 8, 2021)
 
 ### Fixed
 
 -   Fixed disabled icon & text color for `<pxb-info-list-item>` and `<mat-menu-item>`.
 -   Fixed dark-mode active item text color for `<pxb-drawer>` rail variant.
 
-## v6.0.2
+## v6.0.2 (April 5, 2021)
 
 ### Fixed
 
 -   Fixed default `<pxb-drawer-header>` and `<pxb-dropdown-toolbar>` background color.
 
-## v6.0.1
+## v6.0.1 (March 31, 2021)
 
 ### Added
 
@@ -32,7 +38,7 @@
 -   Updated `<pxb-empty-state>` default colors.
 -   Updated CSS rule-specificity for some default styles. If you have been using custom style overrides, check to make sure that your rules are specific enough to take precedence over the defaults.
 
-## v5.2.0
+## v5.2.0 (December 10, 2020)
 
 ### Added
 
@@ -43,7 +49,7 @@
 -   Update `filled` input field light-themed background color.
 -   Update `<pxb-drawer>` theme.
 
-## v5.1.2
+## v5.1.2 (September 30, 2020)
 
 ### Added
 
@@ -57,27 +63,27 @@
 
 -   Remove `<mat-button>` uppercase default behavior.
 
-## v5.1.1
+## v5.1.1 (August 14, 2020)
 
 ### Fixed
 
 -   Fix an issue with with setting a color for `<pxb-info-list-item>` text.
 
-## v5.1.0
+## v5.1.0 (July 22, 2020)
 
 ### Added
 
 -   Add UserMenu theme.
 
-## v5.0.0
+## v5.0.0 (June 30, 2020)
 
 ### Changed
 
 -   Update theme definitions to use the [@pxblue/colors](https://www.npmjs.com/package/@pxblue/colors) version 3.0.0.
 <!-- - Update color schemes to address accessibility concerns. -->
 -   Update default typography styles for consistency.
 
-## v4.0.0
+## v4.0.0 (February 24, 2020)
 
 ### Changed
 

angular/PUBLISHING.md

@@ -1,19 +1,27 @@
 # Publishing Instructions
 
-To update the version number, edit the version in `angular/package.json`.
+## Automatic Publishing
 
-To publish a new package through NPM, run the following commands from the root folder:
+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.
 
-```sh
-npm publish --tag <alpha | beta>
-```
+-   The `dev` branch will publish versions marked as `alpha` or `beta`.
+-   The `master` branch will publish any version (`alpha`, `beta`, or `latest`).
+    In both cases, the code will only be published if the version number differs from the current version published under the respective dist tag.
 
-Alternatively, you can run:
+## Manually Publishing
+
+If you need to publish a package manually, you can run the following commands from the root folder:
 
 ```sh
 yarn publish:package
 ```
 
-which will automatically look at the version in `angular/package.json` and determine whether to publish an alpha, beta, or latest package. For this command to work, you must have an NPM token configured in your environment variables or you can perform a login prior to executing the publish command via `npm adduser && yarn publish:package`.
+The publishing script will look at the version in the `package.json` and automatically determine whether to publish an alpha, beta, or latest package.
+
+For this command to work, you must have an NPM token configured in your environment variables or you can perform a login prior to executing the publish command via:
+
+```sh
+npm adduser && yarn publish:package
+```
 
-> The above command should only be run manually for `alpha` or `beta` packages. Latest packages should only be published automatically by CircleCI once the code has been merged into the master branch.
+> 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.

angular/_pxb-component-theme.scss

@@ -131,9 +131,11 @@
         color: inherit;
         background-color: inherit;
     }
-    .pxb-user-menu-overlay {
+    .pxb-user-menu-overlay,
+    .pxb-user-menu-bottomsheet {
         .pxb-drawer-header-content.mat-toolbar-single-row.mat-toolbar {
             background-color: unset;
+            color: unset;
         }
     }
 }

angular/package.json

@@ -2,7 +2,7 @@
     "name": "@pxblue/angular-themes",
     "author": "PX Blue <[email protected]>",
     "license": "BSD-3-Clause",
-    "version": "6.0.3",
+    "version": "6.1.0",
     "description": "Angular themes for PX Blue applications",
     "scripts": {
         "initialize": "bash scripts/initializeSubmodule.sh",
@@ -11,7 +11,7 @@
         "link:themes": "bash ./scripts/linkThemes.sh",
         "test": "bash ./scripts/buildTest.sh",
         "prettier": "prettier \"**/**.{css,scss,html,md}\" --write",
-        "publish:package": "bash ./scripts/publish.sh",
+        "publish:package": "set npm_config_yes=true && npx -p @pxblue/publish pxb-publish",
         "precommit": "yarn initialize && yarn install:dependencies && yarn prettier && yarn test"
     },
     "repository": {

react-native/CHANGELOG.md

@@ -1,18 +1,18 @@
 # Changelog
 
-## v5.1.0
+## v5.1.0 (March 30, 2021)
 
 ### Added
 
 -   Initial Dark themes (regular and alternate)
 
-## v5.0.1
+## v5.0.1 (November 19, 2020)
 
 ### Changed
 
 -   Updated peerDependencies to allow for use with react-native-paper version 4.
 
-## v5.0.0
+## v5.0.0 (June 30, 2020)
 
 ### Changed
 
@@ -24,7 +24,7 @@
 -   `onPrimary` color is no longer available.
 -   `sizes` property of the theme has been removed. If you need these size values, they are now exported from @pxblue/react-native-components.
 
-## v4.0.0
+## v4.0.0 (February 24, 2020)
 
 ### Changed
 

react-native/PUBLISHING.md

@@ -1,20 +1,29 @@
 # Publishing Instructions
 
-To update the version number, edit the version in `react-native/package.json`.
+## Automatic Publishing
 
-To publish a new package through NPM, run the following commands from the root folder:
+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.
 
-```
-yarn build
-npm publish --tag <alpha | beta>
-```
+-   The `dev` branch will publish versions marked as `alpha` or `beta`.
+-   The `master` branch will publish any version (`alpha`, `beta`, or `latest`).
+    In both cases, the code will only be published if the version number differs from the current version published under the respective dist tag.
 
-Alternatively, you can run:
+## Manually Publishing
+
+If you need to publish a package manually, you can run the following commands from the root folder:
 
 ```sh
+yarn build
 yarn publish:package
 ```
 
-which will automatically look at the version in `react-native/package.json` and determine whether to publish an alpha, beta, or latest package. For this command to work, you must have an NPM token configured in your environment variables or you can perform a login prior to executing the publish command via `npm adduser && yarn publish:package`.
+The publishing script will look at the version in the `package.json` and automatically determine whether to publish an alpha, beta, or latest package.
+
+For this command to work, you must have an NPM token configured in your environment variables or you can perform a login prior to executing the publish command via:
+
+```sh
+yarn build
+npm adduser && yarn publish:package
+```
 
-> The above command should only be run manually for `alpha` or `beta` packages. Latest packages should only be published automatically by CircleCI once the code has been merged into the master branch.
+> 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.

react-native/package.json

@@ -16,7 +16,7 @@
         "build": "yarn && tsc",
         "link:themes": "bash ./scripts/linkThemes.sh",
         "test": "bash ./scripts/buildTest.sh",
-        "publish:package": "bash ./scripts/publish.sh"
+        "publish:package": "set npm_config_yes=true && npx -p @pxblue/publish pxb-publish"
     },
     "repository": {
         "type": "git",

react/CHANGELOG.md

@@ -1,6 +1,6 @@
 # Change Log
 
-## v6.0.0
+## v6.0.0 (March 29, 2021)
 
 ### Changed
 
@@ -10,7 +10,7 @@
 -   `<Typography>` `subtitle1` variant from regular to semibold to distinguish it from `body1`.
 -   Light theme shadow now uses black500 as the base color.
 
-## v5.0.3
+## v5.0.3 (November 19, 2020)
 
 ### Added
 
@@ -20,19 +20,19 @@
 
 -   Updated `filled` input field light-themed background color.
 
-## v5.0.2
+## v5.0.2 (June 30, 2020)
 
 ### Changed
 
 -   Updated default typography styles for consistency.
 
-## v5.0.1
+## v5.0.1 (May 19, 2020)
 
 ### Changed
 
 -   Updated themes to use [@pxblue/colors](https://www.npmjs.com/package/@pxblue/colors) version 3.0.0.
 
-## v5.0.0
+## v5.0.0 (May 8, 2020)
 
 ### Changed
 
@@ -65,7 +65,7 @@ Notable changes in this theme:
     theme.spacing(5)
     ```
 
-## v4.0.0
+## v4.0.0 (February 24, 2020)
 
 ### Changed