Skip to content

Commit

Permalink
chore: upgrade to SPFx v1.18 and node18 (#2714)
Browse files Browse the repository at this point in the history
* chore: upgrade mgt-spfx to use spfx v1.18

* updates workflows to use node 18
  • Loading branch information
gavinbarron committed Sep 15, 2023
1 parent b9fcfe7 commit ab7f18e
Show file tree
Hide file tree
Showing 15 changed files with 3,089 additions and 2,725 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/next.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:

strategy:
matrix:
node-version: [16.x]
node-version: [18.x]

steps:
- uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-clean-storybook.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:

strategy:
matrix:
node-version: [16.x]
node-version: [18.x]

steps:
- uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-storybook.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:

strategy:
matrix:
node-version: [16.20.0]
node-version: [18.x]

steps:
- uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:

strategy:
matrix:
node-version: [16.x]
node-version: [18.x]

steps:
- uses: actions/checkout@v2
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/push-preview-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:

strategy:
matrix:
node-version: [16.x]
node-version: [18.x]

steps:
- uses: actions/checkout@v2
Expand All @@ -41,7 +41,7 @@ jobs:
if: needs.version.outputs.latest-version != needs.version.outputs.package-version
strategy:
matrix:
node-version: [16.x]
node-version: [18.x]

environment:
name: release
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/push-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:

strategy:
matrix:
node-version: [16.x]
node-version: [18.x]

steps:
- uses: actions/checkout@v2
Expand All @@ -42,7 +42,7 @@ jobs:
if: needs.version.outputs.latest-version != needs.version.outputs.package-version
strategy:
matrix:
node-version: [16.x]
node-version: [18.x]

environment:
name: release
Expand Down Expand Up @@ -88,7 +88,7 @@ jobs:

strategy:
matrix:
node-version: [16.20.0]
node-version: [18.x]

steps:
- uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
if: github.repository == 'microsoftgraph/microsoft-graph-toolkit'
strategy:
matrix:
node-version: [16.x]
node-version: [18.x]

steps:
- uses: actions/checkout@v2
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/run-release-please.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# when the main branch is updated this workflow will run and create or update a combined [release PR](https://github.com/googleapis/release-please#whats-a-release-pr)
# upon approval of the release PR as it adds a v3.x tag the [push-release.yml](./push-release.yml) workflow will run, push the release to npm and update the GitHub
# upon approval of the release PR as it adds a v3.x tag the [push-release.yml](./push-release.yml) workflow will run, push the release to npm and update the GitHub
# release with the mgt-spfx sppkg file
on:
push:
Expand All @@ -14,10 +14,10 @@ jobs:
release-please:
runs-on: ubuntu-latest
steps:
- name: Use Node.js 16.x
- name: Use Node.js 18.x
uses: actions/setup-node@v1
with:
node-version: 16.x
node-version: 18.x
registry-url: 'https://registry.npmjs.org'
- uses: google-github-actions/release-please-action@v3
id: release
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/storybook.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:

strategy:
matrix:
node-version: [16.20.0]
node-version: [18.x]

steps:
- uses: actions/checkout@v2
Expand Down
Binary file modified .npmrc
Binary file not shown.
3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
"samples/react-contoso"
],
"nohoist": [
"**/@microsoft/sp-office-ui-fabric-core**",
"**/office-ui-fabric-core**",
"**/@vue/*"
]
Expand Down Expand Up @@ -154,4 +153,4 @@
"resolutions": {
"responselike": "2.0.0"
}
}
}
3 changes: 2 additions & 1 deletion packages/mgt-spfx/.yo-rc.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,10 @@
"@microsoft/microsoft-graph-client": "3.0.2",
"@microsoft/teams-js": "2.9.1"
},
"version": "1.17.4",
"version": "1.18.0",
"libraryName": "@microsoft/mgt-spfx",
"libraryId": "e342d2ab-fc3f-45f6-93a5-268fd8632211",
"environment": "spo",
"packageManager": "npm",
"isDomainIsolated": false,
"componentType": "library"
Expand Down
14 changes: 7 additions & 7 deletions packages/mgt-spfx/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"url": "https://github.com/microsoftgraph/microsoft-graph-toolkit"
},
"engines": {
"node": ">=16.13.0 <17.0.0"
"node": ">=16.13.0 <17.0.0 || >=18.17.1 <19.0.0"
},
"author": "Microsoft",
"license": "MIT",
Expand All @@ -36,16 +36,16 @@
"tslib": "2.3.1"
},
"devDependencies": {
"@microsoft/rush-stack-compiler-4.5": "0.5.0",
"@microsoft/rush-stack-compiler-4.7": "0.1.0",
"@rushstack/eslint-config": "2.5.1",
"@microsoft/eslint-plugin-spfx": "1.17.4",
"@microsoft/eslint-config-spfx": "1.17.4",
"@microsoft/sp-build-web": "1.17.4",
"@microsoft/eslint-plugin-spfx": "1.18.0",
"@microsoft/eslint-config-spfx": "1.18.0",
"@microsoft/sp-build-web": "1.18.0",
"@types/webpack-env": "~1.15.2",
"ajv": "^6.12.5",
"eslint": "8.7.0",
"gulp": "4.0.2",
"typescript": "4.5.5",
"@microsoft/sp-module-interfaces": "1.17.4"
"typescript": "4.7.4",
"@microsoft/sp-module-interfaces": "1.18.0"
}
}
2 changes: 1 addition & 1 deletion packages/mgt-spfx/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "./node_modules/@microsoft/rush-stack-compiler-4.5/includes/tsconfig-web.json",
"extends": "./node_modules/@microsoft/rush-stack-compiler-4.7/includes/tsconfig-web.json",
"compilerOptions": {
"target": "es5",
"forceConsistentCasingInFileNames": true,
Expand Down

0 comments on commit ab7f18e

Please sign in to comment.