Merge branch 'next/fluentui' into merge/main-to-next

Author: gavinbarron

.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.*']
+
+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 --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'

package.json

@@ -1,7 +1,7 @@
 {
   "name": "root",
   "private": true,
-  "version": "3.0.0",
+  "version": "3.0.0-preview.1",
   "workspaces": {
     "packages": [
       "packages/*",

packages/mgt-element/src/utils/version.ts

@@ -8,4 +8,4 @@
 // THIS FILE IS AUTO GENERATED
 // ANY CHANGES WILL BE LOST DURING BUILD
 
-export const PACKAGE_VERSION = '3.0.0';
+export const PACKAGE_VERSION = '3.0.0-preview.1';

packages/mgt-react/scripts/generate.js

@@ -18,7 +18,9 @@ const tags = new Set([
   'teams-channel-picker',
   'todo',
   'file',
-  'file-list'
+  'file-list',
+  'picker',
+  'theme-toggle'
 ]);
 
 let output = '';

packages/mgt-react/src/generated/react.ts

@@ -70,7 +70,6 @@ export type FileListProps = {
 export type GetProps = {
 	resource?: string;
 	scopes?: string[];
-	version?: string;
 	type?: ResponseType;
 	maxPages?: number;
 	pollingRate?: number;
@@ -107,7 +106,6 @@ export type PeopleProps = {
 	showPresence?: boolean;
 	personCardInteraction?: PersonCardInteraction;
 	resource?: string;
-	version?: string;
 	scopes?: string[];
 	fallbackDetails?: IDynamicPerson[];
 	templateContext?: TemplateContext;

scripts/setVersion.js

@@ -40,11 +40,17 @@ const updateMgtDependencyVersion = (packages, version) => {
 };
 
 const updateSpfxSolutionVersion = (solutions, version) => {
+  const isPreview = version.indexOf('-preview') > 0;
+  if (isPreview) {
+    version = version.replace(/-preview\./, '.');
+  }
   for (let solution of solutions) {
     console.log(`updating spfx solution ${solution} with version ${version}`);
     const data = fs.readFileSync(solution, 'utf8');
 
-    var result = data.replace(/"version": "(.*)"/g, `"version": "${version}.0"`);
+    const result = isPreview
+      ? data.replace(/"version": "(.*)"/g, `"version": "${version}"`)
+      : data.replace(/"version": "(.*)"/g, `"version": "${version}.0"`);
 
     fs.writeFileSync(solution, result, 'utf8');
   }