Merge branch 'master' into patch-1

carbon-design-system · Mar 19, 2020 · ca5be1c · ca5be1c
2 parents 5007d06 + f1bfad6
commit ca5be1c
Show file tree

Hide file tree

Showing 13 changed files with 568 additions and 537 deletions.
diff --git a/.github/workflows/nightly-release.yml b/.github/workflows/nightly-release.yml
@@ -23,12 +23,4 @@ jobs:
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
         run: |
           echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" >> .npmrc
-          yarn lerna publish
-            --canary minor
-            --force-publish
-            --exact
-            --dist-tag nightly
-            --preid alpha
-            --no-push
-            --no-git-tag-version
-            --yes
+          yarn lerna publish --canary minor --force-publish --exact --dist-tag nightly --preid alpha --no-push --no-git-tag-version --yes
diff --git a/packages/react/__tests__/__snapshots__/PublicAPI-test.js.snap b/packages/react/__tests__/__snapshots__/PublicAPI-test.js.snap
@@ -2495,7 +2495,6 @@ Map {
     "defaultProps": Object {
       "onDelete": [Function],
       "status": "uploading",
-      "uuid": "id1",
     },
     "propTypes": Object {
       "errorBody": Object {
@@ -2527,7 +2526,6 @@ Map {
         "type": "oneOf",
       },
       "uuid": Object {
-        "isRequired": true,
         "type": "string",
       },
     },

diff --git a/packages/react/src/components/FileUploader/FileUploader-test.js b/packages/react/src/components/FileUploader/FileUploader-test.js