Skip to content

Commit 34d7582

Browse files
authored
Merge branch 'carbon-design-system:master' into master
2 parents bea0361 + 6ecca36 commit 34d7582

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+4219
-3266
lines changed

.editorconfig

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,14 @@ indent_size = 4
1010
trim_trailing_whitespace = true
1111
insert_final_newline = true
1212

13+
[*.json]
14+
charset = utf-8
15+
end_of_file = lf
16+
indent_style = space
17+
indent_size = 2
18+
trim_trailing_whitespace = true
19+
insert_final_newline = true
20+
1321
[*.yml]
1422
charset = utf-8
1523
indent_style = space

.github/workflows/publish.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,20 @@ on:
88
# Allows us to run this workflow manually from the Actions tab
99
workflow_dispatch:
1010

11+
permissions:
12+
contents: read # for checkout
13+
1114
jobs:
1215
# Single deploy job since we're just deploying
1316
publish:
1417
environment:
1518
name: Deploy
1619
runs-on: ubuntu-latest
20+
permissions:
21+
contents: write # to be able to publish a GitHub release
22+
issues: write # to be able to comment on released issues
23+
pull-requests: write # to be able to comment on pull requests
24+
id-token: write # to enable use of ODIC for npm provenance
1725
steps:
1826
# Checkout to branch
1927
- name: Checkout

README.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,3 +163,12 @@ To keep our build dependencies local we use npm scripts to run our webpack, gulp
163163

164164
## Code of Conduct
165165
Read our code of conduct [here](./.github/CODE_OF_CONDUCT.md)
166+
167+
## <picture><source height="20" width="20" media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/ibm-telemetry/telemetry-js/main/docs/images/ibm-telemetry-dark.svg"><source height="20" width="20" media="(prefers-color-scheme: light)" srcset="https://raw.githubusercontent.com/ibm-telemetry/telemetry-js/main/docs/images/ibm-telemetry-light.svg"><img height="20" width="20" alt="IBM Telemetry" src="https://raw.githubusercontent.com/ibm-telemetry/telemetry-js/main/docs/images/ibm-telemetry-light.svg"></picture> IBM Telemetry
168+
169+
This package uses IBM Telemetry to collect metrics data. By installing this
170+
package as a dependency you are agreeing to telemetry collection. To opt out,
171+
see
172+
[Opting out of IBM Telemetry data collection](https://github.com/ibm-telemetry/telemetry-js/tree/main#opting-out-of-ibm-telemetry-data-collection).
173+
For more information on the data being collected, please see the
174+
[IBM Telemetry documentation](https://github.com/ibm-telemetry/telemetry-js/tree/main#ibm-telemetry-collection-basics).

0 commit comments

Comments
 (0)