Skip to content

Commit

Permalink
Merge branch 'main' into fix/tag-colors
Browse files Browse the repository at this point in the history
  • Loading branch information
kodiakhq[bot] authored Jan 6, 2022
2 parents 8acb583 + 7e3e381 commit b3fb609
Show file tree
Hide file tree
Showing 12 changed files with 20 additions and 19 deletions.
1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE/BUG_REPORT.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ body:
- '@carbon/themes'
- '@carbon/type'
- '@carbon/upgrade'
- 'carbon-components-svelte'
validations:
required: true
- type: dropdown
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Use Node.js 14.x
uses: actions/[email protected].0
uses: actions/[email protected].1
with:
node-version: '14.x'
- name: Run yarn dedupe
Expand All @@ -23,7 +23,7 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Use Node.js 14.x
uses: actions/[email protected].0
uses: actions/[email protected].1
with:
node-version: '14.x'
- name: Install dependencies
Expand All @@ -36,7 +36,7 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Use Node.js 14.x
uses: actions/[email protected].0
uses: actions/[email protected].1
with:
node-version: '14.x'
- name: Install dependencies
Expand All @@ -51,7 +51,7 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Use Node.js 14.x
uses: actions/[email protected].0
uses: actions/[email protected].1
with:
node-version: '14.x'
- uses: actions/[email protected]
Expand All @@ -77,7 +77,7 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Use Node.js 14.x
uses: actions/[email protected].0
uses: actions/[email protected].1
with:
node-version: '14.x'
- uses: actions/[email protected]
Expand Down Expand Up @@ -113,7 +113,7 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Use Node.js 14.x
uses: actions/[email protected].0
uses: actions/[email protected].1
with:
node-version: '14.x'
- uses: actions/[email protected]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-react-storybook.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
steps:
- uses: actions/checkout@main
- name: Use Node.js 14.x
uses: actions/[email protected].0
uses: actions/[email protected].1
with:
node-version: '14.x'
- name: Install dependencies
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-vanilla-devenv.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
steps:
- uses: actions/checkout@main
- name: Use Node.js 14.x
uses: actions/[email protected].0
uses: actions/[email protected].1
with:
node-version: '14.x'
- name: Install dependencies
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nightly-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
steps:
- uses: actions/checkout@main
- name: Use Node.js 14.x
uses: actions/[email protected].0
uses: actions/[email protected].1
with:
node-version: '14.x'
- name: Install dependencies
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- uses: actions/checkout@v1

- name: Use Node.js 14.x
uses: actions/[email protected].0
uses: actions/[email protected].1
with:
node-version: '14.x'
registry-url: 'https://registry.npmjs.org'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sync-generated-files.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
steps:
- uses: actions/checkout@v1
- name: Use Node.js 14.x
uses: actions/[email protected].0
uses: actions/[email protected].1
with:
node-version: '14.x'
- name: Install dependencies
Expand Down
2 changes: 1 addition & 1 deletion packages/colors/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"@carbon/test-utils": "^10.20.0",
"change-case": "^4.1.1",
"fs-extra": "^10.0.0",
"node-sass": "^6.0.1",
"node-sass": "^7.0.1",
"rimraf": "^3.0.0"
},
"sideEffects": false,
Expand Down
2 changes: 1 addition & 1 deletion packages/components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@
"minimatch": "^3.0.4",
"mkdirp": "^0.5.0",
"mock-raf": "^1.0.0",
"node-sass": "^6.0.1",
"node-sass": "^7.0.1",
"nodemon": "^1.18.7",
"path-to-regexp": "^6.2.0",
"portscanner": "^2.2.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/test-utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"tabbable": "^4.0.0"
},
"devDependencies": {
"node-sass": "^6.0.1",
"node-sass": "^7.0.1",
"react-dom": "^16.9.0"
}
}
2 changes: 1 addition & 1 deletion packages/themes/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"core-js": "^3.16.0",
"fs-extra": "^10.0.0",
"js-yaml": "^3.13.0",
"node-sass": "^6.0.1",
"node-sass": "^7.0.1",
"rimraf": "^3.0.0"
},
"sideEffects": false
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1763,7 +1763,7 @@ __metadata:
"@carbon/test-utils": ^10.20.0
change-case: ^4.1.1
fs-extra: ^10.0.0
node-sass: ^6.0.1
node-sass: ^7.0.1
rimraf: ^3.0.0
languageName: unknown
linkType: soft
Expand Down Expand Up @@ -2108,7 +2108,7 @@ __metadata:
version: 0.0.0-use.local
resolution: "@carbon/test-utils@workspace:packages/test-utils"
dependencies:
node-sass: ^6.0.1
node-sass: ^7.0.1
prettier: ^2.2.1
react: ^17.0.1
react-dom: ^16.9.0
Expand Down Expand Up @@ -2139,7 +2139,7 @@ __metadata:
core-js: ^3.16.0
fs-extra: ^10.0.0
js-yaml: ^3.13.0
node-sass: ^6.0.1
node-sass: ^7.0.1
rimraf: ^3.0.0
languageName: unknown
linkType: soft
Expand Down Expand Up @@ -10829,7 +10829,7 @@ __metadata:
minimatch: ^3.0.4
mkdirp: ^0.5.0
mock-raf: ^1.0.0
node-sass: ^6.0.1
node-sass: ^7.0.1
nodemon: ^1.18.7
path-to-regexp: ^6.2.0
portscanner: ^2.2.0
Expand Down

0 comments on commit b3fb609

Please sign in to comment.