chore: Deploy docs to production (#9357)

* Deploy docs production

* Slight logo update

* Remove trailing slash

Author: devongovett

.circleci/config.yml

@@ -494,21 +494,6 @@ jobs:
           paths:
             - '*/storybook-s2/'
 
-  docs-production:
-    executor: rsp-xlarge
-    steps:
-      - restore_cache:
-          key: react-spectrum-{{ .Environment.CACHE_VERSION }}-{{ .Environment.CIRCLE_SHA1 }}
-
-      - run:
-          name: build docs
-          command: make website-production
-
-      - persist_to_workspace:
-          root: dist
-          paths:
-            - '*/docs/'
-
   s2-docs:
     executor: rsp-xlarge
     steps:
@@ -838,26 +823,6 @@ jobs:
               done
             fi
 
-  deploy-production:
-    docker:
-      - image: mcr.microsoft.com/azure-cli:2.63.0
-    steps:
-      - attach_workspace:
-          at: /tmp/dist
-      - run:
-          name: Install AzCopy
-          command: |
-            wget -O azcopy.tar.gz https://aka.ms/downloadazcopy-v10-linux
-            tar -xf azcopy.tar.gz
-            mv ./azcopy_linux_amd64_*/azcopy /usr/local/bin/
-      - run:
-          name: deploy
-          command: |
-            azcopy copy "/tmp/dist/production/docs/*" "https://reactspectrum.blob.core.windows.net/\$web${AZURE_STORAGE_SAS_TOKEN}" --recursive --exclude-pattern "*.md;*.txt;*.html;*.rsc"
-            azcopy copy "/tmp/dist/production/docs/*" "https://reactspectrum.blob.core.windows.net/\$web${AZURE_STORAGE_SAS_TOKEN}" --recursive --include-pattern "*.md" --content-type "text/markdown; charset=utf-8" --cache-control "max-age=300"
-            azcopy copy "/tmp/dist/production/docs/*" "https://reactspectrum.blob.core.windows.net/\$web${AZURE_STORAGE_SAS_TOKEN}" --recursive --include-pattern "*.txt" --content-type "text/plain; charset=utf-8" --cache-control "max-age=300"
-            azcopy copy "/tmp/dist/production/docs/*" "https://reactspectrum.blob.core.windows.net/\$web${AZURE_STORAGE_SAS_TOKEN}" --recursive --include-pattern "*.html;*.rsc" --cache-control "max-age=300"
-
   deploy-s3-stage:
     executor: rsp
     steps:
@@ -868,6 +833,16 @@ jobs:
           dir: s2
           bucket: s3://react-spectrum-stage
 
+  deploy-s3-production:
+    executor: rsp
+    steps:
+      - deploy-s3:
+          dir: react-aria
+          bucket: s3://react-aria-production
+      - deploy-s3:
+          dir: s2
+          bucket: s3://react-spectrum-production
+
   comment:
     executor: rsp
     steps:
@@ -1085,18 +1060,18 @@ workflows:
           - equal: [ "workflow_dispatch", << pipeline.parameters.GHA_Event >>]
     jobs:
       - install
-      - docs-production:
+      - s2-docs-production:
           filters:
             branches:
               only: main
           requires:
             - install
-      - deploy-production:
+      - deploy-s3-production:
           filters:
             branches:
               only: main
           requires:
-            - docs-production
+            - s2-docs-production
 
   nightly:
     triggers:

packages/dev/docs/src/utils.js

@@ -67,7 +67,7 @@ export function getBaseUrl(library) {
     url.pathname = publicUrl.replace(/\/$/, '') + url.pathname.replace(/\/$/, '');
     base = url.href;
   }
-  return base;
+  return base.replace(/\/$/, '');
 }
 
 export function getAnchorProps(href) {

packages/dev/s2-docs/assets/react-aria-favicon.svg

@@ -39,12 +39,12 @@ export const hideFromSearch = true;
             author: 'Adobe Inc',
             headline: 'React Spectrum',
             description,
-            // image: ogImage,
+            image: `${getBaseUrl('s2')}/og/index.png`,
             publisher: {
               '@type': 'Organization',
               url: 'https://www.adobe.com',
               name: 'Adobe',
-              logo: rspFavicon
+              logo: 'https://www.adobe.com/favicon.ico'
             }
           }
         )}} />

packages/dev/s2-docs/pages/s2/index.mdx

@@ -5,7 +5,7 @@ import {style, StyleString} from '@react-spectrum/s2/style' with {type: 'macro'}
 export const ReactAriaLogo = ({styles}: {styles?: StyleString}) => {
   return (
     <svg className={mergeStyles(style({size: 24, flexShrink: 0, display: 'block'}), styles)}  viewBox="200 206 800 790" fill="none">
-      <path d="M720.977 206C867.87 206 986.95 325.079 986.951 471.971C986.951 590.705 909.147 691.263 801.743 725.455L996.496 969.116C1004.8 979.509 997.403 994.897 984.099 994.897H783.931C774.667 994.897 765.864 990.85 759.834 983.817L697.676 911.329L493.465 653.333C457.478 607.867 489.857 540.938 547.842 540.936L720.977 540.93C759.061 540.93 789.934 510.054 789.934 471.971C789.933 433.888 759.06 403.016 720.977 403.016H430.286C405.305 403.016 388.975 391.865 374.349 373.604L277.717 252.964C262.564 234.046 276.032 206.001 300.27 206H720.977Z M396.955 720.641C408.147 705.343 430.789 704.78 442.726 719.504L504.152 796.942H503.124L535.902 838.852C548.405 854.274 550.274 877.104 538.38 893.001L469.156 982.565C463.145 990.343 453.87 994.897 444.041 994.897H215.9C202.668 994.897 195.246 979.656 203.405 969.239L338.351 796.942H338.281L396.955 720.641Z" fill="light-dark(#6733FF, #7F57FF)" />
+      <path d="M720.67 205.995C867.583 205.995 986.679 325.091 986.68 472.003C986.68 590.753 908.865 691.325 801.446 725.521L979.312 948.055C994.438 966.98 980.963 995 956.736 995H795.612C778.743 995 762.715 987.629 751.734 974.823L697.365 911.421L493.126 653.39C457.134 607.918 489.518 540.979 547.511 540.977L720.67 540.971C758.758 540.971 789.635 510.091 789.635 472.003C789.634 433.915 758.758 403.038 720.67 403.038H429.939C404.955 403.038 388.623 391.886 373.994 373.623L277.349 252.966C262.194 234.045 275.664 205.996 299.905 205.995H720.67Z M396.605 720.706C407.798 705.406 430.443 704.843 442.381 719.568L503.816 797.018H502.786L535.569 838.934C548.074 854.358 549.943 877.191 538.047 893.09L476.638 972.545C465.692 986.707 448.803 995 430.903 995H242.276C218.18 995 204.665 967.248 219.523 948.278L337.992 797.018H337.923L396.605 720.706Z" fill="light-dark(#6733FF, #7F57FF)" />
     </svg>
   );
 };