Merge branch 'main' into callout-icon-bug-fix

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Security Issues
+    url: mailto:security@chanzuckerberg.com
+    about: Please responsibly disclose security issues by emailing us at security@chanzuckerberg.com.

.github/ISSUE_TEMPLATE/request-new-component.yml

@@ -0,0 +1,50 @@
+name: Request new SDS component
+description: Request a component be added to SDS
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for requesting a new component in the SDS! Please fill out the following information about the requested component.
+  - type: input
+    id: component-name
+    attributes:
+      label: Component Name
+      description: A name for the desired component.
+    validations:
+      required: true
+  - type: textarea
+    id: component-requirements
+    attributes:
+      label: Component Requirements
+      description: A list of requirements for the component.
+    validations:
+      required: true
+  - type: input
+    id: mui-base-component
+    attributes:
+      label: MUI Base Component (if applicable)
+      description: If the component is based on a Material-UI component, please specify.
+      placeholder: e.g., MUI Button
+    validations:
+      required: false
+  - type: input
+    id: teams-requesting
+    attributes:
+      label: Team(s) Requesting
+      description: The team(s) that need this component.
+    validations:
+      required: true
+  - type: input
+    id: component-needed-by
+    attributes:
+      label: Component Needed By
+      description: The date by which the component is needed.
+    validations:
+      required: true
+  - type: input
+    id: component-screenshot
+    attributes:
+      label: Component Screenshot / Prototype
+      description: A link to a screenshot or prototype of the component.
+    validations:
+      required: false

.github/ISSUE_TEMPLATE/request-support.yml

@@ -0,0 +1,21 @@
+name: Request support
+description: Request support for a SDS component
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Please fill out the form below to request help with a SDS component.
+  - type: input
+    id: component-name
+    attributes:
+      label: Component Name
+      description: Component that help request is for.
+    validations:
+      required: true
+  - type: textarea
+    id: issue-description
+    attributes:
+      label: Issue description
+      description: Details about the issue with the component.
+    validations:
+      required: true

.github/PULL_REQUEST_TEMPLATE.md

@@ -2,7 +2,7 @@
 
 **Structural Element (Base, Gene, DNA, Chromosome or Cell)**
 Github issue: [#XXXX](link)
-Copy isuue descirption here
+Copy issue description here
 
 ## Checklist
 

.github/workflows/release.yml

@@ -89,6 +89,58 @@ jobs:
           config: .github/config/slack.yml
         if: contains(toJson(github.event.commits.*.message), 'BREAKING CHANGE')
 
+      # Step 12: Merge prod branch into main
+      - name: Create PR to merge prod into main
+        id: createpr
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        uses: actions/github-script@v6
+        with:
+          script: |
+            const ownerAndRepo = '${{ github.repository }}';
+            const [owner, repo] = ownerAndRepo.split('/');
+            const head = "prod";
+            const base = "main";
+            const title = "feat: Merge prod into main";
+            const pr = await github.rest.pulls.list({owner, repo, base, head: `${owner}:${head}`})
+            if (pr.data.length>0) {
+              return pr.data[0].number;
+            }
+            const result = await github.rest.pulls.create({
+              owner,
+              repo,
+              head,
+              base,
+              title,
+            });
+            return result.data.number;
+
+      # Steps 13 - 15 are temporarily disable until we find a solution
+      # to the issue of GitHub Actions not being able to merge PRs
+
+      # Step 13: Automerge PR
+      # - name: Enable Automerge PR
+      #   env:
+      #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      #   uses: peter-evans/enable-pull-request-automerge@v3
+      #   with:
+      #     pull-request-number: ${{steps.createpr.outputs.result}}
+      #     merge-method: squash
+
+      # Step 14: Generate token for autoapproving PR
+      # - name: Generate token
+      #   id: generate_token
+      #   uses: chanzuckerberg/github-app-token@v1.1.4
+      #   with:
+      #     app_id: ${{ secrets.CZI_GITHUB_HELPER_APP_ID }}
+      #     private_key: ${{ secrets.CZI_GITHUB_HELPER_PK }}
+
+      # Step 15: Autoapprove PR
+      # - name: Autoapprove PR
+      #   run: gh pr review --approve "${{steps.createpr.outputs.result}}"
+      #   env:
+      #     GITHUB_TOKEN: ${{ steps.generate_token.outputs.token }}
+
   # Job 2
   create-version-matrix:
     needs: release

.github/workflows/storybook-tests.yml

@@ -43,7 +43,9 @@ jobs:
 
       # Step 7: Serve Storybook and run tests concurrently
       - name: Serve Storybook and run tests
+        # (Node version >= 18) it's now necessary to explicitly
+        # declare the IP address (127.0.0.1) in this context.
         run: |
           npx concurrently -k -s first -n "SB,TEST" -c "magenta,blue" \
             "npx http-server docs-build --port 6006 --silent" \
-            "npx wait-on tcp:6006 && yarn test-storybook"
+            "npx wait-on tcp:127.0.0.1:6006 && yarn test-storybook"

.node-version

@@ -1 +1 @@
-16.15.1
+18.19.0

lerna.json

@@ -1,7 +1,6 @@
 {
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
   "useNx": true,
-  "useWorkspaces": true,
   "version": "independent",
   "npmClient": "npm",
   "stream": true,