Skip to content

Commit

Permalink
feat: nodejs 16 support (#1911)
Browse files Browse the repository at this point in the history
* Updates dependencies to allow for developers to build using NodeJS 12-16

* adding node versions 14 and 16 to PR build matrix

* update workflows to use node 16 as the default build environment
  • Loading branch information
gavinbarron authored Oct 26, 2022
1 parent 21549f8 commit a573bdf
Show file tree
Hide file tree
Showing 10 changed files with 14 additions and 11 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: [12.x]
node-version: [16.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: [12.x]
node-version: [16.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: [12.x]
node-version: [16.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 @@ -13,7 +13,7 @@ jobs:

strategy:
matrix:
node-version: [12.x]
node-version: [12.x, 14.x, 16.x]

steps:
- uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion .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: [12.x]
node-version: [16.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: [12.x]
node-version: [16.x]

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

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

steps:
- uses: actions/checkout@v2
Expand All @@ -37,7 +37,7 @@ jobs:
branch: gh-pages
folder: storybook-static
target-folder: next
clean-exclude: |
clean-exclude: |
pr
fluentui
token: ${{ secrets.GITHUB_TOKEN }}
2 changes: 1 addition & 1 deletion gulpfile.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const gulp = require('gulp');
const sass = require('gulp-sass');
const sass = require('gulp-sass')(require('sass'));
const gap = require('gulp-append-prepend');
const cleanCSS = require('gulp-clean-css');
const rename = require('gulp-rename');
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
"gulp-clean-css": "4.3.0",
"gulp-header-license": "^1.0.10",
"gulp-rename": "^2.0.0",
"gulp-sass": "^4.1.0",
"gulp-sass": "^5.1.0",
"gulp-util": "^3.0.8",
"husky": "^4.3.0",
"jest": "^24.5.0",
Expand Down
5 changes: 4 additions & 1 deletion packages/mgt-react/src/generated/react.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { OfficeGraphInsightString,ViewType,ResponseType,IDynamicPerson,PersonType,GroupType,UserType,PersonCardInteraction,MgtPersonConfig,AvatarSize,PersonViewType,TasksStringResource,TasksSource,TaskFilter,SelectedChannel,TodoFilter } from '@microsoft/mgt-components';
import { OfficeGraphInsightString,ViewType,ResponseType,IDynamicPerson,LoginViewType,PersonType,GroupType,UserType,PersonCardInteraction,MgtPersonConfig,AvatarSize,PersonViewType,TasksStringResource,TasksSource,TaskFilter,SelectedChannel,TodoFilter } from '@microsoft/mgt-components';
import { TemplateContext,ComponentMediaQuery } from '@microsoft/mgt-element';
import * as MicrosoftGraph from '@microsoft/microsoft-graph-types';
import * as MicrosoftGraphBeta from '@microsoft/microsoft-graph-types-beta';
Expand Down Expand Up @@ -84,6 +84,8 @@ export type GetProps = {

export type LoginProps = {
userDetails?: IDynamicPerson;
showPresence?: boolean;
loginView?: LoginViewType;
templateContext?: TemplateContext;
mediaQuery?: ComponentMediaQuery;
loginInitiated?: (e: Event) => void;
Expand Down Expand Up @@ -164,6 +166,7 @@ export type PersonProps = {
personQuery?: string;
fallbackDetails?: IDynamicPerson;
userId?: string;
usage?: string;
showPresence?: boolean;
personDetails?: IDynamicPerson;
personImage?: string;
Expand Down

0 comments on commit a573bdf

Please sign in to comment.