chore: resolve conflicts and merge v3 to main

Author: gavinbarron

.devcontainer/devcontainer.json

@@ -1,5 +1,5 @@
 {
-  "image": "mcr.microsoft.com/devcontainers/javascript-node:0-14",
+  "image": "mcr.microsoft.com/devcontainers/javascript-node:0-16",
   "customizations": {
     "vscode": {
       "extensions": [
@@ -8,7 +8,7 @@
         "runem.lit-plugin",
         "esbenp.prettier-vscode",
         "rebornix.project-snippets",
-        "ms-vscode.vscode-typescript-tslint-plugin",
+        "dbaeumer.vscode-eslint",
         "mutantdino.resourcemonitor"
       ]
     }

.eslintrc.js

@@ -0,0 +1,34 @@
+module.exports = {
+  env: {
+    browser: true,
+    es6: true,
+    node: true
+  },
+  extends: ['@microsoft/eslint-config-msgraph'],
+  parser: '@typescript-eslint/parser',
+  parserOptions: {
+    project: [
+      'packages/mgt/tsconfig.json',
+      'packages/mgt-element/tsconfig.json',
+      'packages/mgt-components/tsconfig.json',
+      'packages/mgt-react/tsconfig.json',
+      'packages/mgt-spfx/tsconfig.json',
+      'packages/mgt-spfx-utils/tsconfig.json',
+      'packages/providers/mgt-electron-provider/tsconfig.authenticator.json',
+      'packages/providers/mgt-electron-provider/tsconfig.provider.json',
+      'packages/providers/mgt-mock-provider/tsconfig.json',
+      'packages/providers/mgt-msal2-provider/tsconfig.json',
+      'packages/providers/mgt-proxy-provider/tsconfig.json',
+      'packages/providers/mgt-sharepoint-provider/tsconfig.json',
+      'packages/providers/mgt-teamsfx-provider/tsconfig.json'
+    ],
+    sourceType: 'module'
+  },
+  plugins: ['eslint-plugin-jsdoc', 'eslint-plugin-prefer-arrow', 'eslint-plugin-react', '@typescript-eslint'],
+  root: true,
+  ignorePatterns: ['**/**-css.ts', '.eslintrc.js', '*.cjs'],
+  rules: {
+    '@typescript-eslint/prefer-optional-chain': 'warn',
+    'newline-per-chained-call': 'off'
+  }
+};

.github/policies/microsoft-graph-toolkit-branch-protection.yml

@@ -34,7 +34,7 @@ configuration:
     # Are merge commits prohibited from being pushed to this branch. boolean
     requiresLinearHistory: false
     # Require branches to be up to date before merging. Requires requiredStatusChecks. boolean
-    requiresStrictStatusChecks: true
+    requiresStrictStatusChecks: false
     # Indicates whether there are restrictions on who can push. boolean. Should be set with whoCanPush.
     restrictsPushes: false
     # Restrict who can dismiss pull request reviews. boolean
@@ -64,7 +64,7 @@ configuration:
     # Are merge commits prohibited from being pushed to this branch. boolean
     requiresLinearHistory: false
     # Require branches to be up to date before merging. Requires requiredStatusChecks. boolean
-    requiresStrictStatusChecks: true
+    requiresStrictStatusChecks: false
     # Indicates whether there are restrictions on who can push. boolean. Should be set with whoCanPush.
     restrictsPushes: false
     # Restrict who can dismiss pull request reviews. boolean
@@ -94,7 +94,7 @@ configuration:
     # Are merge commits prohibited from being pushed to this branch. boolean
     requiresLinearHistory: false
     # Require branches to be up to date before merging. Requires requiredStatusChecks. boolean
-    requiresStrictStatusChecks: true
+    requiresStrictStatusChecks: false
     # Indicates whether there are restrictions on who can push. boolean. Should be set with whoCanPush.
     restrictsPushes: false
     # Restrict who can dismiss pull request reviews. boolean
@@ -128,7 +128,7 @@ configuration:
     # Are merge commits prohibited from being pushed to this branch. boolean
     requiresLinearHistory: false
     # Require branches to be up to date before merging. Requires requiredStatusChecks. boolean
-    requiresStrictStatusChecks: true
+    requiresStrictStatusChecks: false
     # Indicates whether there are restrictions on who can push. boolean. Should be set with whoCanPush.
     restrictsPushes: false
     # Restrict who can dismiss pull request reviews. boolean

.github/workflows/next.yml

@@ -15,7 +15,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [14.x]
+        node-version: [16.x]
 
     steps:
       - uses: actions/checkout@v2

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

@@ -15,7 +15,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [14.x]
+        node-version: [16.x]
 
     steps:
       - uses: actions/checkout@v2

.github/workflows/pr-reporting.yml

@@ -1,9 +1,11 @@
+name: PR Quality Reporting
+
 on:
   workflow_run:
     workflows: [Build pr]
     types:
       - completed
-    branches: [main, release/**, next/**, feat/add-jest-tests]
+    branches: [main, release/**, next/**]
 
 jobs:
   pr_report:

.github/workflows/pr-storybook.yml

@@ -15,7 +15,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [14.x]
+        node-version: [16.x]
 
     steps:
       - uses: actions/checkout@v2

.github/workflows/pr.yml

@@ -1,5 +1,7 @@
 # This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node
 # For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
+# Tests are executed and coverage reports are emitted as to the action summary
+# A dependent workflow which uses workflow_run as a trigger reads the archived outputs and emits comments to the PR triggering this build
 
 name: Build pr
 
@@ -13,32 +15,53 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [14.x]
+        node-version: [16.x]
 
     steps:
       - uses: actions/checkout@v2
       - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v1
         with:
           node-version: ${{ matrix.node-version }}
-      - run: npm install -g yarn
-      - run: yarn
+      - name: Cache Node Modules
+        id: cache-node-modules
+        uses: actions/cache@v2
+        with:
+          path: |
+            node_modules
+            */*/node_modules
+          key: ${{ runner.os }}-${{ matrix.node-version }}-${{ hashFiles('**/yarn.lock') }}
+      - run: npm install -g yarn lerna
+      - name: Install node_modules
+        if: steps.cache-node-modules.outputs.cache-hit != 'true'
+        run: yarn
       - run: node scripts/setVersion.js --next
-      - run: yarn run tsc -v
       - run: yarn build
-      - run: yarn run pack
-
-      - name: Upload a Build Artifact - package
-        uses: actions/upload-artifact@v2
+      - run: yarn lint
+      - run: yarn test
+      - name: Archive test results
+        uses: actions/upload-artifact@v2 # upload test results
+        if: always() # run this step even if previous step failed
         with:
-          name: npm-packages
-          path: artifacts/*
+          name: test-results
+          path: testResults/junit.xml
+      - name: Archive coverage report
+        uses: actions/upload-artifact@v2 # upload coverage report
+        if: always() # run this step even if previous step failed
+        with:
+          name: coverage
+          path: coverage/cobertura-coverage.xml
 
-      - name: Upload a Build Artifact - bundle
-        uses: actions/upload-artifact@v2
+      - name: Code Coverage Summary Report
+        uses: irongut/[email protected]
         with:
-          name: bundle
-          path: packages/mgt/dist/bundle
+          filename: coverage/cobertura-coverage.xml
+          badge: true
+          format: 'markdown'
+          output: 'both'
+
+      - name: Write to Job Summary
+        run: cat code-coverage-results.md >> $GITHUB_STEP_SUMMARY
 
   # The check-build-matrix returns success if all matrix jobs in build are successful; otherwise, it returns a failure.
   # Use this as a PR status check for GitHub Policy Service instead of individual matrix entry checks.
@@ -47,7 +70,7 @@ jobs:
     needs: build
     if: always()
     steps:
-      - name: All build matrix options are successful 
+      - name: All build matrix options are successful
         if: ${{ !(contains(needs.*.result, 'failure')) }}
         run: exit 0
       - name: One or more build matrix options failed

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

@@ -0,0 +1,84 @@
+# This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node
+# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
+
+name: Create Preview release
+on:
+  push:
+    tags: ['v3.*-preview.*', 'v3.*-rc.*']
+
+jobs:
+  version:
+    runs-on: ubuntu-latest
+
+    outputs:
+      latest-version: ${{steps.latest-version.outputs.version}}
+      package-version: ${{steps.package-version.outputs.current-version}}
+
+    strategy:
+      matrix:
+        node-version: [16.x]
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v1
+        with:
+          node-version: ${{ matrix.node-version }}
+          registry-url: 'https://registry.npmjs.org'
+
+      - name: Get latest version from npm
+        id: latest-version
+        run: echo ::set-output name=version::$(npm show @microsoft/mgt version)
+
+      - name: Get current package version
+        id: package-version
+        uses: martinbeentjes/npm-get-version-action@master
+
+  release:
+    runs-on: ubuntu-latest
+    needs: version
+    if: needs.version.outputs.latest-version != needs.version.outputs.package-version
+    strategy:
+      matrix:
+        node-version: [16.x]
+
+    environment:
+      name: release
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v1
+        with:
+          node-version: ${{ matrix.node-version }}
+          registry-url: 'https://registry.npmjs.org'
+
+      - name: Install Dependencies
+        run: |
+          npm install -g yarn lerna
+          yarn
+
+      - name: Update package version
+        run: node scripts/setVersion.js
+
+      - name: Build 🛠
+        run: yarn build
+
+      - name: Publish npm packages
+        run: lerna exec --scope @microsoft/* -- "npm publish --tag preview --access=public"
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+
+      - name: Attach mgt-spfx solution to GitHub release
+        run: node scripts/uploadSpfxSolution.js ${{secrets.GITHUB_TOKEN}} ${{needs.version.outputs.package-version}}
+
+      - name: ReleaseNotes
+        uses: anton-yurchenko/[email protected]
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          DRAFT_RELEASE: 'true'
+          PRE_RELEASE: 'true'
+          CHANGELOG_FILE: 'CHANGELOG.md'
+          ALLOW_EMPTY_CHANGELOG: 'true'

.github/workflows/push-release.yml

@@ -17,7 +17,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [14.x]
+        node-version: [16.x]
 
     steps:
       - uses: actions/checkout@v2
@@ -42,7 +42,7 @@ jobs:
     if: needs.version.outputs.latest-version != needs.version.outputs.package-version
     strategy:
       matrix:
-        node-version: [14.x]
+        node-version: [16.x]
 
     environment:
       name: release
@@ -58,7 +58,7 @@ jobs:
 
       - name: Install Dependencies
         run: |
-          npm install -g yarn lerna@6.4.1
+          npm install -g yarn lerna
           yarn
 
       - name: Update package version
@@ -88,7 +88,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [14.x]
+        node-version: [16.x]
 
     steps:
       - uses: actions/checkout@v2