studiokit-scaffolding-js 4.11.2 → 4.11.3

package/README.md

@@ -86,25 +86,32 @@ Components and utils can be imported from `studiokit-scaffolding-js/lib/...`
 ## Branches
 
 1. Create a new branch
-	* **Features**: In GitLab from an issue, create a branch off of `develop`
-	* **Hotfixes**: Create a `hotfix` branch off of `master` (manually or in GitLab by making an MR)
-1. Update the version number by appending `-next.1.1` (or `-alpha.1` for hotfix branches)
-	* e.g. If the current version is `1.0.0`, the new branch should be `1.0.0-next.1.1` (`1.0.1-alpha.1` for hotfix)
+	* **Feature/Issue**: In GitLab from an issue, create a branch off of `develop`
+	* **Hotfix**: Create a `hotfix` branch off of `master` (manually or in GitLab by making an MR)
+1. Update the version number
+	* **Feature/Issue**
+		* append `-next.1.1`
+		* e.g. If the current version is `1.0.0`, the new branch should be `1.0.0-next.1.1`
+	* **Hotfix**
+		* increase the version number and append `-alpha.1`
+		* e.g. If the current version is `1.0.0`, the new branch should be `1.0.1-alpha.1` for hotfix
 	* **NOTE:** if **more than one** branch is being developed on at the same time, simply increment the **first** number after "next"
 		* e.g. `1.0.0-next.2.1` for the second issue branch (this won't apply for hotfixes)
 1. Development Loop
 	1. Add/update new components, utils, or styles
 	1. Add/update unit tests for those components or utils to confirm basic functionality
-	1. Increment the **last** number in the version, e.g. `1.0.0-next.2.1` => `1.0.0-next.2.2` (`1.0.1-alpha.1` => `1.0.1-alpha.2` for hotfixes)
+	1. Increment the **last** number in the version
+		* e.g. `1.0.0-next.2.1` => `1.0.0-next.2.2` for a feature/issue branch
+		* e.g. `1.0.1-alpha.1` => `1.0.1-alpha.2` for a hotfix branch
 	1. Push to gitlab. Azure DevOps will run a pipeline and publish this version to npmjs.org
 	1. Install the new version in the project(s) you are working on by updating its `package.json` and running `yarn`
 	1. Repeat as needed
 1. Merging
-	* After the Merge Request is approved, **remove** the "next" or "alpha" suffix from the version **before** merging
-	* For **hotfix** branches, increment the version to the new patch number, e.g. `1.0.1`
+	* After the Merge Request is approved, **remove** the "next" or "alpha" suffix from the version **before** merging to develop or master
+	* For **hotfix** branches, the version number should be the new patch number, e.g. `1.0.1`
 1. Release
-	* **Features**: After merging, create a new "release" branch from `develop` and follow the "git flow" release steps as normal
-	* **Hotfixes**: Finish the "git flow" hotfix steps as normal from the hotfix branch
+	* **Feature/Issue**: After merging, create a new "release" branch from `develop` and follow the "git flow" release steps as normal
+	* **Hotfix**: Finish the "git flow" hotfix steps as normal from the hotfix branch
 	* Azure DevOps will run a pipeline to publish the version merged to `master` to npmjs.org
 
 ## Styles

package/lib/constants/mockData.d.ts

@@ -33,6 +33,7 @@ export declare const defaultNamelessUserInfo: {
     dateStored: string;
     dateLastUpdated: string;
     isImpersonated: boolean;
+    lockDownBrowserTestLaunchUrl: string | null;
     id: string;
     firstName: string | null;
     lastName: string | null;
@@ -53,6 +54,7 @@ export declare const defaultNamedUserInfo: {
     dateStored: string;
     dateLastUpdated: string;
     isImpersonated: boolean;
+    lockDownBrowserTestLaunchUrl: string | null;
     id: string;
     email: string | null;
     _metadata?: import("studiokit-net-js").Metadata | undefined;

package/lib/constants/mockData.js

@@ -89,7 +89,8 @@ exports.defaultUser = {
         careerAccountAlias: null,
         employeeNumber: null,
         userName: 'test',
-        puid: null
+        puid: null,
+        lockDownBrowserTestLaunchUrl: null
     }
 };
 exports.defaultNamelessUserInfo = __assign(__assign({}, exports.defaultUser.userInfo), {

package/lib/types/User.d.ts

@@ -62,6 +62,7 @@ export interface UserInfo extends User {
      * Whether or not the User is being impersonated by another User
      */
     isImpersonated: boolean;
+    lockDownBrowserTestLaunchUrl: string | null;
 }
 export interface EntityUser extends User {
     entityId: number;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "studiokit-scaffolding-js",
-	"version": "4.11.2",
+	"version": "4.11.3",
 	"description": "Common scaffolding for Studio apps at Purdue",
 	"repository": "https://gitlab.com/purdue-informatics/studiokit/studiokit-scaffolding-js",
 	"license": "MIT",