Merge tag 'v2.16.1' of github.com:salesforce-ux/design-system-internal

Accommodates addition of CODEOWNERS file

2.16.1

Author: Dottenpixel

.circleci/config.yml

@@ -5,9 +5,8 @@
 version: 2.1
 
 orbs:
-  node: circleci/node@4.0.1
+  node: circleci/node@4.3.0
   heroku: circleci/[email protected]
-  aws-s3: circleci/[email protected]
   browser-tools: circleci/[email protected]
 
 executors:
@@ -37,9 +36,15 @@ commands:
           name: 'Decompress design-tokens'
           command: 'tar -xvf workspace/design-tokens.tar'
 
+  set-github-pr-number:
+    description: 'Set Github pull-request number environment variable'
+    steps:
+      - run: echo 'export PR_NUMBER=$(cat workspace/gh-pr-num.txt)' >> $BASH_ENV
+
   set-heroku-app-name:
     description: 'Set Heroku app name environment variable'
     steps:
+      - set-github-pr-number
       # if on default branch without a tag
       #   then publish to UPCOMING
       #
@@ -58,26 +63,32 @@ commands:
             if [[ "${CIRCLE_BRANCH}" = "${CURRENT_DEFAULT_BRANCH}" ]] ; then
               echo "Publishing to UPCOMING..."
               echo 'export HEROKU_APP_NAME=${HEROKU_APP_UPCOMING}' >> $BASH_ENV
+              echo 'export HEROKU_RELEASE_STORYBOOK_APP_NAME=storybook-upcoming' >> $BASH_ENV
             elif [[ ${CIRCLE_TAG} =~ ^v[0-9]+\.[0-9]+\.[0-9]+-.+$ ]] ; then
               echo "Publishing to CORE-MAIN..."
               echo 'export HEROKU_APP_NAME=${HEROKU_APP_CORE_MAIN}' >> $BASH_ENV
+              echo 'export HEROKU_RELEASE_STORYBOOK_APP_NAME=storybook-core-main' >> $BASH_ENV
             elif [[ ${CIRCLE_TAG} =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]] ; then
               echo "Publishing to CORE-PATCH..."
               echo 'export HEROKU_APP_NAME=${HEROKU_APP_CORE_PATCH}' >> $BASH_ENV
+              echo 'export HEROKU_RELEASE_STORYBOOK_APP_NAME=storybook-core-patch' >> $BASH_ENV
             else
               echo "Publishing to pull-request review app..."
-              echo 'export HEROKU_APP_NAME=slds-review-site-pr-${CIRCLE_PULL_REQUEST##*/}' >> $BASH_ENV
+              echo 'export HEROKU_APP_NAME=slds-review-site-pr-${PR_NUMBER}' >> $BASH_ENV
+              echo 'export HEROKU_RELEASE_STORYBOOK_APP_NAME=true' >> $BASH_ENV
             fi
-            echo 'export HEROKU_RELEASE_STORYBOOK_APP_NAME=${HEROKU_APP_NAME}' >> $BASH_ENV
             source $BASH_ENV
             echo $HEROKU_APP_NAME > workspace/heroku-app-name.txt
             echo $HEROKU_RELEASE_STORYBOOK_APP_NAME > workspace/heroku-release-storybook-app-name.txt
 
+      - run: printenv | sort
+
       - run:
           name: Show HEROKU_APP_NAME value
           command: |
+            echo "gh-pr-num.txt = $(cat workspace/gh-pr-num.txt)"
             echo
-            echo "CIRCLE_PULL_REQUEST = ${CIRCLE_PULL_REQUEST}"
+            echo "PR_NUMBER = ${PR_NUMBER}"
             echo
             echo "=============================="
             cat workspace/heroku-app-name.txt
@@ -92,6 +103,7 @@ commands:
       - attach_workspace:
           at: workspace
 
+      - node/install-npm
       - vrt-set-env-vars
       - add-applitools
       - node/install-packages
@@ -105,15 +117,17 @@ commands:
   vrt-set-env-vars:
     description: 'Set VRT environment variables'
     steps:
+      - set-github-pr-number
+      - run: printenv | sort
+
       - run:
           name: 'Set environment variables'
           command: |
             echo 'export APPLITOOLS_BATCH_ID=${CIRCLE_SHA1}' >> $BASH_ENV
-            echo 'export APPLITOOLS_BATCH_NAME="PR #${CIRCLE_PULL_REQUEST##*/} (${CIRCLE_USERNAME})"' >> $BASH_ENV
-            echo 'export PR_NUMBER=${CIRCLE_PULL_REQUEST##*/}' >> $BASH_ENV
+            echo 'export APPLITOOLS_BATCH_NAME="PR #${PR_NUMBER} (${CIRCLE_USERNAME})"' >> $BASH_ENV
             echo 'export APPLITOOLS_DONT_CLOSE_BATCHES="true"' >> $BASH_ENV
             echo 'export APPLITOOLS_BATCH_NOTIFY="true"' >> $BASH_ENV
-            echo 'export REVIEW_APP_NAME=slds-storybook-pr-${CIRCLE_PULL_REQUEST##*/}' >> $BASH_ENV
+            echo 'export REVIEW_APP_NAME=slds-storybook-pr-${PR_NUMBER}' >> $BASH_ENV
 
   vrt-close-batch:
     description: 'Notify Applitools that tests have completed'
@@ -161,8 +175,8 @@ commands:
           command: 'curl --connect-timeout 2 --max-time 2 --retry 50 --retry-delay 0 --retry-max-time 300 --retry-connrefused --ipv4 -q "http://localhost:8080"'
 
 jobs:
-  # Build SLDS styles
-  prepare:
+  # Init bits & bobs subsequent jobs require
+  init:
     executor: slds-executor
     resource_class: small
 
@@ -171,6 +185,40 @@ jobs:
       - run: mkdir -p workspace
       - install-gh-cli
 
+      - run:
+          name: Get Github pull-request number
+          command: |
+            set +e
+            gh pr view --json number,state,title,url > gh-pull-data.json
+            for ((x=0 ; x<5 ; x++)) ; do
+              if [ -z $(cat gh-pull-data.json | jq -r '.number') ] ; then
+                gh pr view --json number,state,title,url > gh-pull-data.json
+              else
+                echo "» Pull-request #"$(cat gh-pull-data.json | jq -r '.number')
+                break
+              fi
+            done
+            echo
+            echo "=== Github pull-request API results ==="
+            cat gh-pull-data.json
+            echo "---------------------------------------"
+            cat gh-pull-data.json | jq -r '.number' > workspace/gh-pr-num.txt && cat workspace/gh-pr-num.txt
+
+      - run:
+          name: Verify Github pull-request number
+          command: |
+            echo "» Branch: "${CIRCLE_BRANCH}
+            echo
+            if [[ ${CIRCLE_BRANCH} =~ ^[0-9]{3}-(summer|spring|winter)-[0-9]{2}$ || -n ${CIRCLE_TAG} ]] ; then
+              echo "» Does not require a pull-request number"
+            else
+              if [ -z $(cat workspace/gh-pr-num.txt) ] ; then
+                echo "» No pull-request number found!"
+                echo "» Please try running this CI workflow again."
+                exit 1
+              fi
+            fi
+
       - run:
           name: Retrieve Github deployments
           command: |
@@ -184,8 +232,25 @@ jobs:
               gh api ${STATUS_URL} -f state=in_progress -H "Accept: application/vnd.github.flash-preview+json"
             done
 
+      - persist_to_workspace:
+          root: workspace
+          paths:
+            - gh-deployments.json
+            - gh-pr-num.txt
+
+  # Build SLDS styles
+  prepare:
+    executor: slds-executor
+    resource_class: small
+
+    steps:
+      - checkout
+      - attach_workspace:
+          at: workspace
+
       - set-heroku-app-name
 
+      - node/install-npm
       - node/install-packages
 
       # Gulp tasks (need to clean-up and not run through `npm run`)
@@ -212,7 +277,6 @@ jobs:
             - metadata.tar
             - heroku-app-name.txt
             - heroku-release-storybook-app-name.txt
-            - gh-deployments.json
 
   # Build SLDS .dist
   framework-build:
@@ -236,6 +300,7 @@ jobs:
           name: 'Decompress metadata'
           command: 'tar -xvf workspace/metadata.tar'
 
+      - node/install-npm
       - node/install-packages
 
       - run:
@@ -249,24 +314,43 @@ jobs:
             tar -cvf workspace/design-system-dist.tar .dist/
             cd .dist && zip -r dist . && mv dist.zip ../workspace/ && cd ..
 
-      - aws-s3/copy:
-          from: workspace/dist.zip
-          to: 's3://sldsbuilds/design-system/${CIRCLE_SHA1}/'
-
       - persist_to_workspace:
           root: workspace
           paths:
             - design-system-dist.tar
             - dist.zip
 
-  # Publish to S3 & trigger database update
+  # Publish artifact & trigger database update
   populate-database:
     executor: slds-executor
     resource_class: small
 
     steps:
       - checkout
 
+      - attach_workspace:
+          at: workspace
+
+      - install-gh-cli
+
+      - run:
+          name: 'Github: attach artifact to release'
+          command: |
+            export VERSION_FROM_TAG=$([[ ${CIRCLE_TAG} =~ ^v.* ]] && echo ${CIRCLE_TAG:1:20} || echo ${CIRCLE_TAG})
+            export VERSION_FROM_PACKAGE=$(cat package.json | jq -r .version)
+
+            gh release view v${VERSION_FROM_TAG} | grep v${VERSION_FROM_TAG}
+
+            if [ $? -eq 0 ]; then
+              cp workspace/dist.zip workspace/slds-v${VERSION_FROM_TAG}.zip
+              echo "=============================="
+              echo "» Attaching artifact to release v${VERSION_FROM_TAG}"
+              gh release upload v${VERSION_FROM_TAG} workspace/slds-v${VERSION_FROM_TAG}.zip#"SLDS v${VERSION_FROM_TAG}" --clobber
+            else
+              echo "=============================="
+              echo "» ERROR: release v${VERSION_FROM_TAG} not found on Github"
+            fi
+
       - run:
           name: Trigger database update via API
           command: |
@@ -275,11 +359,11 @@ jobs:
             export VERSION_FROM_PACKAGE=$(cat package.json | jq -r .version)
             curl --location --request PATCH 'https://api.lightningdesignsystem.com/v1/release' \
             --header 'Content-Type: application/json' \
-            --header 'Authorization: Bearer ${DSE_API_RELEASE_TOKEN}' \
+            --header 'Authorization: Bearer '"$DSE_API_RELEASE_TOKEN"'' \
             --data-raw '{
-                "sha": "${CIRCLE_SHA1}",
-                "version": "${VERSION_FROM_TAG}",
-                "salesforce_version": "${SALESFORCE_VERSION}"
+                "sha": "'"$CIRCLE_SHA1"'",
+                "version":"'"$VERSION_FROM_TAG"'",
+                "salesforce_version": "'"$SALESFORCE_VERSION"'"
             }'
 
   # Build static Storybook
@@ -292,6 +376,7 @@ jobs:
       - attach_workspace:
           at: workspace
       - copy-tokens-from-workspace
+      - node/install-npm
       - node/install-packages
 
       - run:
@@ -383,6 +468,7 @@ jobs:
             mkdir -p .slds
             tar -xvf workspace/design-system-dist.tar --directory .slds
 
+      - node/install-npm
       - node/install-packages
 
       - run:
@@ -473,11 +559,18 @@ workflows:
   version: 2
   CI:
     jobs:
+      - init:
+          context: ux-eng-keys
+          filters:
+            tags:
+              only: /.*/
       - prepare:
           context: ux-eng-keys
           filters:
             tags:
               only: /.*/
+          requires:
+            - init
       - build-storybook:
           context: ux-eng-keys
           # do not run for future version tags (X.X.X-*)
@@ -520,18 +613,24 @@ workflows:
           filters:
             branches:
               ignore: /^\d{3}-(summer|spring|winter)-\d{2}$/
+          requires:
+            - init
       - vrt-mobile:
           context: ux-eng-keys
           # do not run for main version branches
           filters:
             branches:
               ignore: /^\d{3}-(summer|spring|winter)-\d{2}$/
+          requires:
+            - init
       - vrt-legacy:
           context: ux-eng-keys
           # do not run for main version branches
           filters:
             branches:
               ignore: /^\d{3}-(summer|spring|winter)-\d{2}$/
+          requires:
+            - init
       - vrt-close:
           context: ux-eng-keys
           requires:

.github/dependabot.yml

@@ -0,0 +1,9 @@
+version: 2
+updates:
+  # Enable version updates for npm
+  - package-ecosystem: "npm"
+    # Look for `package.json` and `lock` files in the `root` directory
+    directory: "/"
+    # Check the npm registry for updates every day (weekdays)
+    schedule:
+      interval: "weekly"

.gitignore

@@ -22,6 +22,7 @@
 !/.circleci
 !/.npmrc
 !/.nvmrc
+!/.snyk
 
 # Add a .gitkeep file in an empty
 # directory to check it in the repository
@@ -64,3 +65,7 @@ coverage
 # Local postcss packages
 install-postcss.sh
 applitools.*.local.js
+
+__release
+
+*.bak