master -> main (#1180)

* Update eslint config to ^v4.0.0 * Minor file changes to comply with eslint rules * Remove unused disable eslint directives * Spellcheck * Update changelogs * Update based on comments * master -> main * Fix aria and ignore compat issue (with reason) * change log * Update packages/terra-application-utility/CHANGELOG.md Co-authored-by: Ben Cai <[email protected]> * fix wdio test Co-authored-by: Dianna McGinn <[email protected]> Co-authored-by: Ben Cai <[email protected]>
cerner · Jul 7, 2020 · ca8fde8 · ca8fde8
1 parent 4880772
commit ca8fde8
Show file tree

Hide file tree

Showing 188 changed files with 308 additions and 309 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,7 +4,7 @@ services:
   - docker
 branches:
   only:
-    - master
+    - main
 cache:
   directories:
     - $HOME/$TRAVIS_BUILD_ID
@@ -92,7 +92,7 @@ jobs:
         github_token: $GITHUB_TOKEN # Set in travis-ci.com dashboard
         local_dir: build
         on:
-          branch: master
+          branch: main
     - stage: clean up cache
       before_install: true
       script:

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -9,7 +9,7 @@ Thanks.
 ## Issue Reporting
 
 * Please browse our [existing issues][1] before logging new issues.
-* Check that the issue has not already been fixed in the `master` branch.
+* Check that the issue has not already been fixed in the `main` branch.
 * Open an issue with a descriptive title and a summary.
 * Please be as clear and explicit as you can in your description of the problem.
 * Please state the version of Operating System, Browser, and terra-framework you are using in the description.
@@ -30,7 +30,7 @@ Thanks.
 * The pull request will be reviewed by the community and merged by the project committers.
 
 ## Project Governance
-* This project is maintained and governed following the [terra governance document](https://github.com/cerner/terra-ui/blob/master/GOVERNANCE.md).
+* This project is maintained and governed following the [terra governance document](https://github.com/cerner/terra-ui/blob/main/GOVERNANCE.md).
 
 [1]: https://github.com/cerner/terra-framework/issues
 [2]: http://gun.io/blog/how-to-github-fork-branch-and-pull-request

diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
@@ -34,6 +34,7 @@ Cerner Corporation
 - Phil Dodderidge [@pdodde]
 - Jordan Spoor [@Me999999999]
 - Eric McCullough [@EricM96]
+- Dianna McGinn [@DMcginn]
 
 [@tbiethman]: https://github.com/tbiethman
 [@mjhenkes]: https://github.com/mjhenkes
@@ -69,3 +70,4 @@ Cerner Corporation
 [@pdodde]: https://github.com/pdodde
 [@Me999999999]: https://github.com/Me999999999
 [@EricM96]: https://github.com/EricM96
+[@DMcginn]: https://github.com/DMcginn
diff --git a/README.md b/README.md
diff --git a/RELEASE.md b/RELEASE.md
@@ -3,8 +3,8 @@
 This project is hosted on NPM.  You can find the terra packages [here][project-url].
 
 Below is a guide for releasing packages:
-- Checkout the master branch and run `git pull` to ensure you have the latest changes in master.
-- Run `npm run clean:install` to ensure you have npm packages updated for the master branch.
+- Checkout the `main` branch and run `git pull` to ensure you have the latest changes in `main`.
+- Run `npm run clean:install` to ensure you have npm packages updated for the `main` branch.
 - Run `lerna updated` to view all packages that have updates to be released.
 - Be sure to check the changelogs of all packages that have updates and ensure the changelogs are updated accordingly.
 

diff --git a/package.json b/package.json
@@ -25,7 +25,7 @@
     "extends browserslist-config-terra"
   ],
   "eslintConfig": {
-    "extends": "terra",
+    "extends": "@cerner/terra",
     "overrides": [
       {
         "files": [
@@ -113,6 +113,7 @@
     "@babel/plugin-transform-runtime": "^7.5.0",
     "@babel/preset-env": "^7.5.0",
     "@babel/preset-react": "^7.0.0",
+    "@cerner/eslint-config-terra": "^4.0.0",
     "babel-jest": "^24.8.0",
     "browserslist-config-terra": "^1.0.0",
     "check-installed-dependencies": "^1.0.0",
@@ -122,7 +123,6 @@
     "enzyme-adapter-react-16": "^1.1.1",
     "enzyme-to-json": "^3.2.2",
     "eslint": "^6.1.0",
-    "eslint-config-terra": "^3.0.0",
     "gh-pages": "^2.0.1",
     "glob": "^7.1.1",
     "identity-obj-proxy": "^3.0.0",

diff --git a/packages/terra-abstract-modal/CHANGELOG.md b/packages/terra-abstract-modal/CHANGELOG.md
@@ -3,6 +3,8 @@ Changelog
 
 Unreleased
 ----------
+### Changed
+* Minor file changes to comply with eslint rules
 
 3.26.0 - (June 2, 2020)
 ------------------

diff --git a/...stract-modal/src/terra-dev-site/test/abstract-modal/AbstractModalContentOverflow.test.jsx b/...stract-modal/src/terra-dev-site/test/abstract-modal/AbstractModalContentOverflow.test.jsx
diff --git a/packages/terra-aggregator/CHANGELOG.md b/packages/terra-aggregator/CHANGELOG.md
@@ -3,6 +3,9 @@ Changelog
 
 Unreleased
 ----------
+### Changed
+* updated `master` references to `main`.
+* Minor file changes to comply with eslint rules
 
 4.52.0 - (June 16, 2020)
 ------------------

diff --git a/packages/terra-aggregator/README.md b/packages/terra-aggregator/README.md
@@ -6,7 +6,7 @@ The Aggregator provides focus-based mechanisms for managing actions across dispa
 [![Build Status](https://badgen.net/travis/cerner/terra-framework)](https://travis-ci.com/cerner/terra-framework)
 
 - [Getting Started](#getting-started)
-- [Documentation](https://github.com/cerner/terra-framework/tree/master/packages/terra-aggregator/docs)
+- [Documentation](https://github.com/cerner/terra-framework/tree/main/packages/terra-aggregator/docs)
 - [LICENSE](#license)
 
 ## Getting Started

diff --git a/packages/terra-aggregator/src/terra-dev-site/doc/common/SimpleAggregatorItem.jsx b/packages/terra-aggregator/src/terra-dev-site/doc/common/SimpleAggregatorItem.jsx
@@ -25,7 +25,7 @@ const SimpleAggregatorItem = ({ name, aggregatorDelegate, ...customProps }) => (
             aggregatorDelegate.releaseFocus();
           }}
         >
-        Release Focus
+          Release Focus
         </button>
       )
       : (
@@ -35,7 +35,7 @@ const SimpleAggregatorItem = ({ name, aggregatorDelegate, ...customProps }) => (
             aggregatorDelegate.requestFocus();
           }}
         >
-        Get Focus
+          Get Focus
         </button>
       )}
     {aggregatorDelegate.hasFocus ? <h4>Section has focus!</h4> : null}

diff --git a/packages/terra-application-header-layout/CHANGELOG.md b/packages/terra-application-header-layout/CHANGELOG.md
@@ -3,6 +3,8 @@ Changelog
 
 Unreleased
 ----------
+### Changed
+* updated `master` references to `main`.
 
 3.28.0 - (May 26, 2020)
 ------------------

diff --git a/packages/terra-application-header-layout/README.md b/packages/terra-application-header-layout/README.md
@@ -6,7 +6,7 @@
 This component renders an application header layout. To be used with a terra-layout or terra-navigation-layout.
 
 - [Getting Started](#getting-started)
-- [Documentation](https://github.com/cerner/terra-framework/tree/master/packages/terra-application-header-layout/docs)
+- [Documentation](https://github.com/cerner/terra-framework/tree/main/packages/terra-application-header-layout/docs)
 - [LICENSE](#license)
 
 ## Getting Started

diff --git a/packages/terra-application-layout/CHANGELOG.md b/packages/terra-application-layout/CHANGELOG.md
@@ -3,6 +3,10 @@ Changelog
 
 Unreleased
 ----------
+### Changed
+* updated `master` references to `main`.
+* Minor file changes to comply with eslint rules
+* Removed unused disable eslint directives
 
 5.38.0 - (June 16, 2020)
 ------------------

diff --git a/packages/terra-application-layout/README.md b/packages/terra-application-layout/README.md
@@ -6,7 +6,7 @@ The Terra Application Layout is a responsive, themeable layout for building appl
 [![Build Status](https://badgen.net/travis/cerner/terra-framework)](https://travis-ci.com/cerner/terra-framework)
 
 - [Getting Started](#getting-started)
-- [Documentation](https://github.com/cerner/terra-framework/tree/master/packages/terra-application/docs)
+- [Documentation](https://github.com/cerner/terra-framework/tree/main/packages/terra-application/docs)
 - [LICENSE](#license)
 
 ## Getting Started

diff --git a/packages/terra-application-layout/src/menu/RoutingMenu.jsx b/packages/terra-application-layout/src/menu/RoutingMenu.jsx
@@ -1,4 +1,3 @@
-/* eslint-disable import/no-extraneous-dependencies, import/no-webpack-loader-syntax, import/first, import/no-unresolved, import/extensions  */
 import React from 'react';
 import PropTypes from 'prop-types';
 import { withRouter, matchPath } from 'react-router-dom';

diff --git a/packages/terra-application-layout/src/terra-dev-site/doc/common/ApplicationContent.jsx b/packages/terra-application-layout/src/terra-dev-site/doc/common/ApplicationContent.jsx
@@ -113,21 +113,19 @@ class ApplicationContent extends React.Component {
             <p>For example, the displayed menu component will update the router location when its items are clicked. This content component will be notified of the location change and render the update below.</p>
 
             <p>
-Menu item selected:
-              {(
-                <Route
-                  path={`${basePath}/*`}
-                  render={({ location }) => (
-                    <b>{location.pathname}</b>
-                  )}
-                />
-          )}
+              Menu item selected:
+              <Route
+                path={`${basePath}/*`}
+                render={({ location }) => (
+                  <b>{location.pathname}</b>
+                )}
+              />
             </p>
             <h2>Menu/Content Communication</h2>
             <hr />
             <p>Additionally, communication can occur through custom events or shared context.</p>
             <p>
-Event detected:
+              Event detected:
               <b>{this.state.eventState}</b>
             </p>
           </div>
@@ -140,16 +138,16 @@ Event detected:
           <h2>Layout Control</h2>
           <hr />
           <p>
-Content and menu components will receive a prop named
+            Content and menu components will receive a prop named
             <b>layoutConfig</b>
             {' '}
-which contains APIs for manipulating the layout state. When the layout is tiny or small, the layoutConfig will include a function called `toggleMenu` which will present or dismiss the menu.
+            which contains APIs for manipulating the layout state. When the layout is tiny or small, the layoutConfig will include a function called `toggleMenu` which will present or dismiss the menu.
           </p>
           <Button text="Toggle Menu" isDisabled={!layoutConfig.toggleMenu} onClick={() => { layoutConfig.toggleMenu(); }} />
           <h2>Progressive Disclosure</h2>
           <hr />
           <p>
-The ApplicationLayout includes ModalManager support by default. The ApplicationLayout can be wrapped in additional DisclosureManagers to provide additional disclosure capabilities.
+            The ApplicationLayout includes ModalManager support by default. The ApplicationLayout can be wrapped in additional DisclosureManagers to provide additional disclosure capabilities.
           </p>
           <Button
             text="Launch Modal"

diff --git a/packages/terra-application-layout/src/terra-dev-site/doc/common/ExtensionsDisclosure.jsx b/packages/terra-application-layout/src/terra-dev-site/doc/common/ExtensionsDisclosure.jsx
@@ -27,7 +27,7 @@ const ExtensionsDisclosure = ({ name, disclosureManager }) => (
    )}
   >
     <div className={cx('content-wrapper')}>
-Content for extension:
+      Content for extension:
       {name}
     </div>
   </ContentContainer>

diff --git a/packages/terra-application-layout/src/terra-dev-site/doc/common/UtilityOption.jsx b/packages/terra-application-layout/src/terra-dev-site/doc/common/UtilityOption.jsx
@@ -27,7 +27,7 @@ const UtilityOption = ({ name, disclosureManager }) => (
    )}
   >
     <div className={cx('content-wrapper')}>
-Content for utility key:
+      Content for utility key:
       {name}
     </div>
   </ContentContainer>

diff --git a/packages/terra-application-layout/src/terra-dev-site/doc/example/ExampleApplication.jsx b/packages/terra-application-layout/src/terra-dev-site/doc/example/ExampleApplication.jsx
@@ -207,7 +207,7 @@ const userData = {
  */
 const nameConfig = Object.freeze({
   title: 'Example Application',
-  accessory: <Image variant="rounded" src="https://github.com/cerner/terra-framework/raw/master/terra.png" alt="App logo" height="26px" width="26px" />,
+  accessory: <Image variant="rounded" src="https://github.com/cerner/terra-framework/raw/main/terra.png" alt="App logo" height="26px" width="26px" />,
 });
 
 class ExampleApplication extends React.Component {

diff --git a/...erra-application-layout/src/terra-dev-site/doc/example/ExampleApplicationWithNavIcons.jsx b/...erra-application-layout/src/terra-dev-site/doc/example/ExampleApplicationWithNavIcons.jsx
@@ -221,7 +221,7 @@ const userData = {
  */
 const nameConfig = Object.freeze({
   title: 'Example Application',
-  accessory: <Image variant="rounded" src="https://github.com/cerner/terra-framework/raw/master/terra.png" alt="App logo" height="26px" width="26px" />,
+  accessory: <Image variant="rounded" src="https://github.com/cerner/terra-framework/raw/main/terra.png" alt="App logo" height="26px" width="26px" />,
 });
 
 class ExampleApplication extends React.Component {

diff --git a/...-application-layout/src/terra-dev-site/test/application-layout/ApplicationLayout.test.jsx b/...-application-layout/src/terra-dev-site/test/application-layout/ApplicationLayout.test.jsx
@@ -209,7 +209,7 @@ const userData = {
  */
 const nameConfig = Object.freeze({
   title: 'Test Application',
-  accessory: <Image variant="rounded" src="https://github.com/cerner/terra-framework/raw/master/terra.png" alt="App logo" height="26px" width="26px" />,
+  accessory: <Image variant="rounded" src="https://github.com/cerner/terra-framework/raw/main/terra.png" alt="App logo" height="26px" width="26px" />,
 });
 
 class ApplicationLayoutTest extends React.Component {

diff --git a/...tion-layout/src/terra-dev-site/test/application-layout/ApplicationLayoutNoTopNav.test.jsx b/...tion-layout/src/terra-dev-site/test/application-layout/ApplicationLayoutNoTopNav.test.jsx
@@ -167,7 +167,7 @@ const userData = {
 
 const nameConfig = Object.freeze({
   title: 'Test Application',
-  accessory: <Image variant="rounded" src="https://github.com/cerner/terra-framework/raw/master/terra.png" alt="App logo" height="26px" width="26px" />,
+  accessory: <Image variant="rounded" src="https://github.com/cerner/terra-framework/raw/main/terra.png" alt="App logo" height="26px" width="26px" />,
 });
 
 class ApplicationLayoutTest extends React.Component {

diff --git a/...ion-layout/src/terra-dev-site/test/application-layout/ApplicationLayoutWithIcons.test.jsx b/...ion-layout/src/terra-dev-site/test/application-layout/ApplicationLayoutWithIcons.test.jsx
@@ -223,7 +223,7 @@ const userData = {
  */
 const nameConfig = Object.freeze({
   title: 'Test Application',
-  accessory: <Image variant="rounded" src="https://github.com/cerner/terra-framework/raw/master/terra.png" alt="App logo" height="26px" width="26px" />,
+  accessory: <Image variant="rounded" src="https://github.com/cerner/terra-framework/raw/main/terra.png" alt="App logo" height="26px" width="26px" />,
 });
 
 class ApplicationLayoutTest extends React.Component {

diff --git a/packages/terra-application-links/CHANGELOG.md b/packages/terra-application-links/CHANGELOG.md
@@ -3,6 +3,10 @@ Changelog
 
 Unreleased
 ----------
+### Changed
+* updated `master` references to `main`.
+* Minor file changes to comply with eslint rules
+* Remove unused disable eslint directives
 
 6.36.0 - (June 16, 2020)
 ------------------

diff --git a/packages/terra-application-links/README.md b/packages/terra-application-links/README.md
@@ -7,7 +7,7 @@
 This packages contains a list and tab form of ApplicationLinks, to be used in horizontal and vertical display styles. Selection is managed by react-router.
 
 - [Getting Started](#getting-started)
-- [Documentation](https://github.com/cerner/terra-framework/tree/master/packages/terra-application-links/docs)
+- [Documentation](https://github.com/cerner/terra-framework/tree/main/packages/terra-application-links/docs)
 - [LICENSE](#license)
 
 ## Getting Started

diff --git a/packages/terra-application-links/src/tabs/_TabMenu.jsx b/packages/terra-application-links/src/tabs/_TabMenu.jsx
@@ -87,8 +87,8 @@ class TabMenu extends React.Component {
     for (let i = 0; i < count; i += 1) {
       const child = childArray[i];
       if (matchPath(location.pathname, { path: child.props.path })) {
-        childText = child.props.text; // eslint-disable-line prefer-destructuring
-        icon = child.props.icon; // eslint-disable-line prefer-destructuring
+        childText = child.props.text;
+        icon = child.props.icon;
         isSelected = true;
         break;
       }

diff --git a/packages/terra-application-links/tests/wdio/application-tabs-spec.js b/packages/terra-application-links/tests/wdio/application-tabs-spec.js
@@ -1,4 +1,3 @@
-
 Terra.describeViewports('ApplicationTabs', ['small', 'large'], () => {
   describe('Displays a default application tabs', () => {
     beforeEach(() => {

diff --git a/packages/terra-application-menu-layout/CHANGELOG.md b/packages/terra-application-menu-layout/CHANGELOG.md
@@ -3,6 +3,8 @@ Changelog
 
 Unreleased
 ----------
+### Changed
+* updated `master` references to `main`.
 
 3.23.0 - (April 28, 2020)
 ------------------

diff --git a/packages/terra-application-menu-layout/README.md b/packages/terra-application-menu-layout/README.md
@@ -7,7 +7,7 @@
 This component renders an application menu layout. To be used with a terra-layout or terra-navigation-layout.
 
 - [Getting Started](#getting-started)
-- [Documentation](https://github.com/cerner/terra-framework/tree/master/packages/terra-application-menu-layout/docs)
+- [Documentation](https://github.com/cerner/terra-framework/tree/main/packages/terra-application-menu-layout/docs)
 - [LICENSE](#license)
 
 ## Getting Started

diff --git a/packages/terra-application-name/CHANGELOG.md b/packages/terra-application-name/CHANGELOG.md
@@ -3,6 +3,8 @@ Changelog
 
 Unreleased
 ----------
+### Changed
+* updated `master` references to `main`.
 
 3.30.0 - (June 2, 2020)
 ------------------

diff --git a/packages/terra-application-name/README.md b/packages/terra-application-name/README.md
@@ -7,7 +7,7 @@
 Houses the title of the application, along with a logo. There are two versions - a header version and menu version. These should be used with the corresponding header and menu layouts.
 
 - [Getting Started](#getting-started)
-- [Documentation](https://github.com/cerner/terra-framework/tree/master/packages/terra-application-name/docs)
+- [Documentation](https://github.com/cerner/terra-framework/tree/main/packages/terra-application-name/docs)
 - [LICENSE](#license)
 
 ## Getting Started

diff --git a/...s/terra-application-name/src/terra-dev-site/doc/example/ApplicationHeaderNameStandard.jsx b/...s/terra-application-name/src/terra-dev-site/doc/example/ApplicationHeaderNameStandard.jsx
@@ -15,7 +15,7 @@ const ApplicationHeaderNameStandard = () => (
     logo={(
       <ApplicationHeaderName
         title="App-Name"
-        accessory={<Image alt="Terra Logo" variant="rounded" src="https://github.com/cerner/terra-framework/raw/master/terra.png" className={cx('demo-image-container')} isFluid />}
+        accessory={<Image alt="Terra Logo" variant="rounded" src="https://github.com/cerner/terra-framework/raw/main/terra.png" className={cx('demo-image-container')} isFluid />}
         className={cx(['demo-background-color'])}
       />
     )}

diff --git a/...ges/terra-application-name/src/terra-dev-site/doc/example/ApplicationMenuNameStandard.jsx b/...ges/terra-application-name/src/terra-dev-site/doc/example/ApplicationMenuNameStandard.jsx
@@ -15,7 +15,7 @@ const ApplicationMenuNameStandard = () => (
     header={(
       <ApplicationMenuName
         title="App-Name"
-        accessory={<Image alt="Terra Logo" variant="rounded" src="https://github.com/cerner/terra-framework/raw/master/terra.png" className={cx('demo-image-container')} isFluid />}
+        accessory={<Image alt="Terra Logo" variant="rounded" src="https://github.com/cerner/terra-framework/raw/main/terra.png" className={cx('demo-image-container')} isFluid />}
         className={cx(['demo-background-color'])}
       />
     )}

diff --git a/...ation-name/src/terra-dev-site/test/application-name/ApplicationHeaderNameDefault.test.jsx b/...ation-name/src/terra-dev-site/test/application-name/ApplicationHeaderNameDefault.test.jsx
@@ -11,7 +11,7 @@ export default () => (
     <ApplicationHeaderName
       id="default"
       title="Title"
-      accessory={<Image alt="terra accessory" variant="rounded" src="https://github.com/cerner/terra-framework/raw/master/terra.png" className={cx('demo-image-container')} />}
+      accessory={<Image alt="terra accessory" variant="rounded" src="https://github.com/cerner/terra-framework/raw/main/terra.png" className={cx('demo-image-container')} />}
     />
   </div>
 );
diff --git a/...ion-name/src/terra-dev-site/test/application-name/ApplicationHeaderNameTruncated.test.jsx b/...ion-name/src/terra-dev-site/test/application-name/ApplicationHeaderNameTruncated.test.jsx
@@ -11,7 +11,7 @@ export default () => (
     <ApplicationHeaderName
       id="truncated"
       title="TitleTitleTitleTitleTitleTitleTitle"
-      accessory={<Image alt="terra accessory" variant="rounded" src="https://github.com/cerner/terra-framework/raw/master/terra.png" className={cx('demo-image-container')} />}
+      accessory={<Image alt="terra accessory" variant="rounded" src="https://github.com/cerner/terra-framework/raw/main/terra.png" className={cx('demo-image-container')} />}
     />
   </div>
 );