Skip to content

Commit 72e5ed3

Browse files
authored
Merge pull request #2734 from microsoftgraph/merge/update-yarn-change-from-main
chore: merge from main and fix linting issues
2 parents 4b84b3e + a7f0fe2 commit 72e5ed3

File tree

3,724 files changed

+41211
-29863
lines changed

Some content is hidden

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

3,724 files changed

+41211
-29863
lines changed

.babelrc.json

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
{
2+
"sourceType": "unambiguous",
3+
"presets": [
4+
[
5+
"@babel/preset-env",
6+
{
7+
"targets": {
8+
"chrome": 100,
9+
"safari": 15,
10+
"firefox": 91
11+
}
12+
}
13+
],
14+
"@babel/preset-typescript"
15+
],
16+
"plugins": []
17+
}

.eslintrc.js

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,12 @@ module.exports = {
44
es6: true,
55
node: true
66
},
7-
extends: ['@microsoft/eslint-config-msgraph', 'plugin:jsx-a11y/recommended', 'plugin:react-hooks/recommended'],
7+
extends: [
8+
'@microsoft/eslint-config-msgraph',
9+
'plugin:jsx-a11y/recommended',
10+
'plugin:react-hooks/recommended',
11+
'plugin:storybook/recommended'
12+
],
813
parser: '@typescript-eslint/parser',
914
parserOptions: {
1015
project: [
@@ -36,8 +41,9 @@ module.exports = {
3641
root: true,
3742
ignorePatterns: ['**/**-css.ts', '.eslintrc.js', '*.cjs'],
3843
rules: {
39-
'@typescript-eslint/prefer-optional-chain': 'warn',
40-
'newline-per-chained-call': 'off',
44+
'@typescript-eslint/no-explicit-any': 'warn',
45+
// prefer-nullish-coalescing requires strictNullChecking to be turned on
46+
'@typescript-eslint/prefer-nullish-coalescing': 'off',
4147
'react/jsx-curly-spacing': 'off',
4248
'react/jsx-equals-spacing': 'off',
4349
'react/jsx-tag-spacing': [

.gitattributes

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
* text eol=lf
22
*.png -text
3-
*.zip -text
3+
*.zip -text
4+
/.yarn/releases/** binary
5+
/.yarn/plugins/** binary

.github/workflows/next.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515

1616
strategy:
1717
matrix:
18-
node-version: [16.x]
18+
node-version: [18.x]
1919

2020
steps:
2121
- uses: actions/checkout@v2

.github/workflows/pr-clean-storybook.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515

1616
strategy:
1717
matrix:
18-
node-version: [16.x]
18+
node-version: [18.x]
1919

2020
steps:
2121
- uses: actions/checkout@v2

.github/workflows/pr-storybook.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515

1616
strategy:
1717
matrix:
18-
node-version: [16.20.0]
18+
node-version: [18.x]
1919

2020
steps:
2121
- uses: actions/checkout@v2

.github/workflows/pr.yml

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,25 +15,16 @@ jobs:
1515

1616
strategy:
1717
matrix:
18-
node-version: [16.x]
18+
node-version: [18.x]
1919

2020
steps:
21-
- uses: actions/checkout@v2
21+
- uses: actions/checkout@v4
2222
- name: Use Node.js ${{ matrix.node-version }}
2323
uses: actions/setup-node@v1
2424
with:
2525
node-version: ${{ matrix.node-version }}
26-
- name: Cache Node Modules
27-
id: cache-node-modules
28-
uses: actions/cache@v2
29-
with:
30-
path: |
31-
node_modules
32-
*/*/node_modules
33-
key: ${{ runner.os }}-${{ matrix.node-version }}-${{ hashFiles('**/yarn.lock') }}
34-
- run: npm install -g yarn lerna
26+
- run: npm install -g lerna
3527
- name: Install node_modules
36-
if: steps.cache-node-modules.outputs.cache-hit != 'true'
3728
run: yarn
3829
- run: node scripts/setVersion.js --next
3930
- run: yarn build

.github/workflows/push-preview-release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919

2020
strategy:
2121
matrix:
22-
node-version: [16.x]
22+
node-version: [18.x]
2323

2424
steps:
2525
- uses: actions/checkout@v2
@@ -44,7 +44,7 @@ jobs:
4444
if: needs.version.outputs.latest-version != needs.version.outputs.package-version
4545
strategy:
4646
matrix:
47-
node-version: [16.x]
47+
node-version: [18.x]
4848

4949
environment:
5050
name: release

.github/workflows/push-release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717

1818
strategy:
1919
matrix:
20-
node-version: [16.x]
20+
node-version: [18.x]
2121

2222
steps:
2323
- uses: actions/checkout@v2
@@ -42,7 +42,7 @@ jobs:
4242
if: needs.version.outputs.latest-version != needs.version.outputs.package-version
4343
strategy:
4444
matrix:
45-
node-version: [16.x]
45+
node-version: [18.x]
4646

4747
environment:
4848
name: release
@@ -88,7 +88,7 @@ jobs:
8888

8989
strategy:
9090
matrix:
91-
node-version: [16.20.0]
91+
node-version: [18.x]
9292

9393
steps:
9494
- uses: actions/checkout@v2

.github/workflows/push.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
if: github.repository == 'microsoftgraph/microsoft-graph-toolkit'
1616
strategy:
1717
matrix:
18-
node-version: [16.x]
18+
node-version: [18.x]
1919

2020
steps:
2121
- uses: actions/checkout@v2

0 commit comments

Comments
 (0)