Next Version Bump (#1866)

* chore: remove heroku artifacts (#1865) * chore: remove heroku artifacts * chore: remove additional heroku files --------- Co-authored-by: Julian Skinner <[email protected]> * fix(hero): adds missing prop to allow custom class names * fix(modal): move scrollbars to the edge of the container when scrollable * style(modal): use padding instead of margin to move scrollbars away from content * style(modal): update order of props * style(modal): remove overflow hidden --------- Co-authored-by: Julian Skinner <[email protected]> Co-authored-by: Ashley Echols <[email protected]> Co-authored-by: Quinton Jason <[email protected]>
Kajabi · Mar 12, 2024 · 9bd56c6 · 9bd56c6
1 parent 82554f6
commit 9bd56c6
Show file tree

Hide file tree

Showing 12 changed files with 18 additions and 115 deletions.
diff --git a/README.md b/README.md
@@ -117,10 +117,6 @@ When running the `bridge`, you *must* have `yarn start` running in this reposito
 
 Within your Kajabi Products repository, run the project as you usually would and in tandem also run Kajabi-Products' `webpack-dev-server`. For Kajabi Products to watch changes within your local Sage repo `webpack-dev-server` needs to be running.
 
-```bash
-$ heroku local
-```
-
 ```bash
 $ bin/webpack-dev-server
 ```
@@ -184,10 +180,6 @@ Start the documentation site from the `docs/` folder. Will be located at http://
 
 Run `bundle install` on the `docs/` folder.
 
-### `docs:deploy`
-
-This command is to deploy the Documentation Site application to Heroku. This is an automated process through Continuous Deployment.
-
 ### `docs:initialize`
 
 Initialize the docs site. Install all gems/packages
@@ -216,10 +208,6 @@ Establish a local link between the Sage Rails gem and the internal Sage Packages
 
 Run the SassDoc server from the `@kajabi/sage-assets` package.
 
-### `sassdocs:deploy`
-
-This command is for deploying the SassDocs application to Heroku. This is an automated process through Continuous Deployment.
-
 ### `setup` :star:
 
 Run the initial setup scripts
@@ -240,10 +228,6 @@ Continually compiles packages on changes and starts the applications.
 
 Launch "storybook" from the `@kajabi/sage-react` package
 
-### `storybook:deploy`
-
-This command is for deploying the Storybook application to Heroku. This is an automated process through Continuous Integration.
-
 ### `test`
 
 Run all `test:*` scripts

diff --git a/app.json b/app.json
diff --git a/bin/compile b/bin/compile
diff --git a/bin/detect b/bin/detect
diff --git a/bin/release b/bin/release
diff --git a/docs/catalog-info.yaml b/docs/catalog-info.yaml
@@ -9,7 +9,7 @@ metadata:
     - javascript
     - documentation
   links:
-    - url: https://sage-lib-documentation.herokuapp.com/pages/index
+    - url: https://sage-lib-documentation.production.kajabi.farm/pages/index
       title: Public Documentation Site
       icon: dashboard
 spec:

diff --git a/package.json b/package.json
@@ -45,7 +45,6 @@
     "commit": "yarn cz",
     "docs": "cd docs && yarn start",
     "docs:bundle": "bin/bundle.sh",
-    "docs:deploy": "git push https://heroku:[email protected]/$HEROKU_DOCS_APP_NAME.git `git subtree split --prefix docs main`:master --force",
     "docs:initialize": "yarn docs:bundle && cd docs && yarn install",
     "external": "bin/local-link-frontend.sh false",
     "gem:bump:type": "export SAGE_ORIGINAL_VER=$(bin/gem-version.sh); node bin/js/gem-bump-type.js",
@@ -55,12 +54,10 @@
     "lint:react": "cd packages/sage-react && yarn lint",
     "local": "bin/local-link-frontend.sh true",
     "sassdocs": "cd packages/sage-assets && yarn run start",
-    "sassdocs:deploy": "git push https://heroku:[email protected]/$HEROKU_SASSDOCS_APP_NAME.git `git subtree split --prefix packages/sage-assets main`:master --force",
     "setup": "bin/setup.sh",
     "setup:init": "yarn install && yarn docs:initialize",
     "start": "yarn npm-run-all --parallel build:sd watch docs storybook sassdocs",
     "storybook": "cd packages/sage-react && yarn storybook",
-    "storybook:deploy": "git push https://heroku:[email protected]/$HEROKU_STORYBOOK_APP_NAME.git `git subtree split --prefix packages/sage-react main`:master --force",
     "test": "yarn npm-run-all test:prod:*",
     "test:dev": "yarn npm-run-all test:dev:*",
     "test:dev:react": "cd packages/sage-react && yarn test:dev",

diff --git a/packages/sage-assets/lib/stylesheets/components/_modal.scss b/packages/sage-assets/lib/stylesheets/components/_modal.scss
@@ -268,8 +268,8 @@ $-modal-inner-size: sage-container(md);
   .sage-modal--scrollable & {
     @include overflow-scroll(y);
 
-    margin-top: 0;
-    padding: sage-spacing(xs) sage-spacing(3xs);
+    padding: sage-spacing(xs) sage-spacing(md) sage-spacing(md);
+    margin: 0;
 
     > :first-child {
       margin-top: sage-spacing(xs);

diff --git a/packages/sage-react/lib/Hero/Hero.jsx b/packages/sage-react/lib/Hero/Hero.jsx
@@ -9,6 +9,7 @@ export const Hero = ({
   borderless,
   children,
   ctaAttributes,
+  className,
   customBackgroundColor,
   description,
   contained,
@@ -20,8 +21,9 @@ export const Hero = ({
   titleTag,
   ...rest
 }) => {
-  const className = classnames(
+  const classNames = classnames(
     'sage-hero',
+    className,
     {
       [`sage-hero--${heroSize}`]: heroSize,
       'sage-hero--borderless': borderless,
@@ -41,7 +43,7 @@ export const Hero = ({
 
   return (
     <article
-      className={className}
+      className={classNames}
       style={{ '--custom-background-color': customBackgroundColor || '' }}
       {...rest}
     >
@@ -85,6 +87,7 @@ Hero.defaultProps = {
   ctaAttributes: null,
   children: null,
   contained: false,
+  className: null,
   customBackgroundColor: null,
   description: null,
   footerActions: null,
@@ -117,6 +120,10 @@ Hero.propTypes = {
    * If true, the image will not fill the space.
    */
   contained: PropTypes.bool,
+  /**
+   * Allows a custom class name to apply to the component.
+   */
+  className: PropTypes.string,
   /**
    * The background color to be applied to the Hero.
    */

diff --git a/packages/sage-react/lib/Modal/Modal.story.jsx b/packages/sage-react/lib/Modal/Modal.story.jsx
@@ -148,6 +148,7 @@ export default {
     'Modal.FooterAside': Modal.FooterAside,
   },
   args: {
+    allowScroll: false,
     animation: Modal.ANIMATION_PRESETS,
   },
   argTypes: {
@@ -264,6 +265,7 @@ export const ModalWithCustomSize = (args) => {
       </Button>
       <Modal
         active={active}
+        allowScroll={true}
         animation={{ direction: Modal.ANIMATION_DIRECTIONS.BOTTOM }}
         onExit={onExit}
         size={Modal.SIZES.LG}

diff --git a/packages/sage-react/package.json b/packages/sage-react/package.json
@@ -35,7 +35,6 @@
   "scripts": {
     "build": "build-storybook -o build && webpack --config webpack/webpack.prod.js",
     "build:watch": "build-storybook -o build && webpack --config webpack/webpack.prod.js --watch",
-    "heroku-prebuild": "npm install [email protected] [email protected] [email protected] --no-package-lock",
     "lint": "yarn run eslint \"lib/**/*.{js,jsx}\"",
     "storybook": "start-storybook -p 4100 --ci",
     "preversion": "yarn install && yarn run build",

diff --git a/readme/CICD.md b/readme/CICD.md
@@ -1,17 +1,13 @@
 # Continuous Integration, Deployment, Versioning, and Releases
 
-Continuous Integration is being handled by GitHub Actions with deployments going to Heroku. Lerna is integrated into the Pipeline to allow for automatic Versioning, Changelogs, and Releases.
+Continuous Integration is being handled by GitHub Actions with deployments going to EKS. Lerna is integrated into the Pipeline to allow for automatic Versioning, Changelogs, and Releases.
 
 ## Jobs
 
 ### lint-test-build
 
 The `lint-build-test` job is reponsible for verifying the integrity of the suite. It ensures all linting, testing, and build procedures pass before allowing a merge. This job is run as part of every PR and push to `main`.
 
-*NOTE: Do not ever push to `main` directly*
-
-[Review Apps](https://devcenter.heroku.com/articles/github-integration-review-apps) have been integrated on every PR. They will only show the main Rails Documentation Site.
-
 ### release-and-deploy
 
 The `release-and-deploy` step only triggers on `main` pushes that are not initiated by the CI system. This includes merges into `main` from a PR.
@@ -30,41 +26,12 @@ There are 3 applications as part of the Sage suite. Each of these elements have
 
 ### Rails "Docs" Site
 
-Deployed to: https://sage-lib-documentation.herokuapp.com/
-
-The `docs:deploy` script at the root of the monorepo is designed to push a subtree of the `docs/` folder to the Heroku master.
-
-#### Heroku Env Requirements
-
-> Note: Must be a valid GitHub PAT
-
-```text
-//npm.pkg.github.com/:_authToken=<your_token>
- @kajabi:registry=https://npm.pkg.github.com/
-```
-
-#### Heroku Buildpack Requirements
-
-- https://github.com/debitoor/heroku-buildpack-npmrc.git
-- heroku/ruby
-- heroku/nodejs
+Deployed to: https://sage-lib-documentation.production.kajabi.farm/
 
 ### React Storybook Site
 
-Deployed to: https://sage-lib-storybook.herokuapp.com/
-
-The `storybook:deploy` script at the root of the monorepo is designed to push a subtree of the `packages/sage-react` folder to the Heroku master.
-
-#### Heroku Buildpack Requirements
-
-- heroku/nodejs
+Deployed to: https://sage-lib-storybook.production.kajabi.farm/
 
 ### SASSDocs Site
 
-Deployed to: https://sage-lib-sassdocs.herokuapp.com/
-
-The `sassdoc:deploy` script at the root of the monorepo is designed to push a subtree of the `packages/sage-assets` folder to the Heroku master.
-
-#### Heroku Buildpack Requirements
-
-- heroku/nodejs
+Deployed to: https://sage-lib-sassdocs.production.kajabi.farm/