chore: wc-3 changes necessary in order to bring it back to master (#3…

…1296)

.github/workflows/azure-static-web-apps-deploy.yml

@@ -3,7 +3,7 @@ name: Azure Static Web Apps web components
 on:
   push:
     branches:
-      - web-components-v3
+      - master
     paths:
       - packages/web-components/**
   workflow_dispatch:

.github/workflows/check-packages.yml

@@ -85,5 +85,4 @@ jobs:
             core.exportVariable('BEACHBALL_VERSION', beachballVersion);
 
       - run: |
-          npx beachball@$BEACHBALL_VERSION check -b web-components-v3
-          node ./scripts/beachball/check-wc-3-changefiles
+          npx beachball@$BEACHBALL_VERSION check

apps/vr-tests-web-components/package.json

@@ -23,7 +23,7 @@
   "dependencies": {
     "@fluentui/react-button": "*",
     "@fluentui/react-storybook-addon": "*",
-    "@fluentui/web-components": "3.0.0-beta.15",
+    "@fluentui/web-components": ">=3.0.0-alpha",
     "tslib": "^2.1.0"
   }
 }

azure-pipelines-pr.yml

@@ -1,6 +1,5 @@
 pr:
   - master
-  - web-components-v3 # Remove before merging to master
 
 # There's a separate pipeline for CI which also uses this file, but with a trigger override in the UI
 # https://dev.azure.com/uifabric/fabricpublic/_apps/hub/ms.vss-ciworkflow.build-ci-hub?_a=edit-build-definition&id=164&view=Tab_Triggers

azure-pipelines.bundlesize.yml

@@ -1,10 +1,8 @@
 pr:
   - master
-  - web-components-v3 # Remove before merging to master
 
 trigger:
   - master
-  - web-components-v3 # Remove before merging to master
 
 variables:
   - ${{ if not(startsWith(variables['Build.SourceBranch'], 'refs/heads/')) }}:

azure-pipelines.release.web-components.yml

@@ -30,7 +30,7 @@ schedules:
     displayName: 'Daily release (M-F at 5am UTC+1)'
     branches:
       include:
-        - web-components-v3
+        - master
 
 extends:
   template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines
@@ -75,8 +75,8 @@ extends:
                 displayName: Build, [test], Lint
 
               - script: |
-                  yarn beachball publish -b origin/web-components-v3 --access public -y -n $(npmToken) --config scripts/beachball/release-web-components.config.js
-                  git reset --hard origin/web-components-v3
+                  yarn publish:beachball -n $(npmToken) --config scripts/beachball/release-web-components.config.js
+                  git reset --hard origin/master
                 env:
                   GITHUB_PAT: $(githubPAT)
                 displayName: Publish changes and bump versions

azure-pipelines.vrt-pr.yml

@@ -1,6 +1,5 @@
 pr:
   - master
-  - web-components-v3
 
 # There's a separate pipeline for CI which also uses this file, but with a trigger override in the UI.
 # https://dev.azure.com/uifabric/fabricpublic/_apps/hub/ms.vss-ciworkflow.build-ci-hub?_a=edit-build-definition&id=164&view=Tab_Triggers

change/@fluentui-web-components-db28c4c9-e1dd-4dd0-a4fe-c7fed393995e.json

@@ -0,0 +1,7 @@
+{
+  "type": "none",
+  "comment": "chore: merge wc-3 to master - avoiding any library bumps",
+  "packageName": "@fluentui/web-components",
+  "email": "martinhochel@microsoft.com",
+  "dependentChangeType": "none"
+}

package.json

@@ -18,8 +18,8 @@
     "builddemo": "yarn build --to public-docsite-resources",
     "buildto": "lage build --verbose --to",
     "bundle": "lage bundle --verbose",
-    "change": "beachball change --no-commit -b web-components-v3",
-    "check:change": "beachball check -b web-components-v3",
+    "change": "beachball change --no-commit",
+    "check:change": "beachball check",
     "check:modified-files": "node -r ./scripts/ts-node/register ./scripts/executors/check-for-modified-files",
     "check:affected": "node ./scripts/executors/checkIfPackagesAffected.js",
     "check:installed-dependencies-versions": "satisfied --no-peers --skip-invalid",
@@ -369,9 +369,7 @@
       "typings"
     ],
     "nohoist": [
-      "@fluentui/web-components/@storybook/html",
-      "@fluentui/web-components/@microsoft/api-extractor",
-      "@fluentui/web-components/@microsoft/api-extractor/**"
+      "@fluentui/web-components/@storybook/html"
     ]
   },
   "resolutions": {

packages/web-components/package.json

@@ -198,11 +198,9 @@
   },
   "devDependencies": {
     "@types/web": "^0.0.142",
-    "@microsoft/api-extractor": "7.31.2",
     "@storybook/html": "6.5.15",
     "@tensile-perf/web-components": "~0.1.13",
-    "rimraf": "^3.0.2",
-    "typescript": "4.7.4"
+    "rimraf": "^3.0.2"
   },
   "dependencies": {
     "@microsoft/fast-element": "2.0.0-beta.26",

scripts/beachball/release-web-components.config.js

@@ -1,6 +1,4 @@
-if (process.env.NODE_ENV !== 'test') {
-  require('../ts-node-register');
-}
+require('./register').register();
 
 const { config: sharedConfig } = require('./shared.config');
 const { getConfig } = require('./utils');

scripts/beachball/utils.ts

@@ -20,13 +20,6 @@ export function getConfig({ version }: { version: 'vNext' }): {
 export function getConfig({ version }: { version: 'v8' | 'vNext' | 'web-components' }) {
   const vNextPackagePaths = getVNextPackagePaths();
 
-  if (version === 'web-components') {
-    const ignoreVNextScope = vNextPackagePaths.map(path => `!${path}`);
-    return {
-      scope: ['packages/web-components', '!apps/*', ...ignoreVNextScope],
-    };
-  }
-
   if (version === 'vNext') {
     return {
       scope: [...vNextPackagePaths],
@@ -38,9 +31,15 @@ export function getConfig({ version }: { version: 'v8' | 'vNext' | 'web-componen
     };
   }
 
-  if (version === 'v8') {
-    const ignoreVNextScope = vNextPackagePaths.map(pkgPath => `!${pkgPath}`);
+  const ignoreVNextScope = vNextPackagePaths.map(path => `!${path}`);
 
+  if (version === 'web-components') {
+    return {
+      scope: ['packages/web-components', '!apps/*', ...ignoreVNextScope],
+    };
+  }
+
+  if (version === 'v8') {
     return { scope: [...ignoreVNextScope] };
   }
 

tools/workspace-plugin/src/generators/normalize-package-dependencies/index.ts

@@ -21,7 +21,6 @@ type ProjectIssues = { [projectName: string]: { [depName: string]: string } };
 
 const NORMALIZED_INNER_WORKSPACE_VERSION = '*';
 const NORMALIZED_PRERELEASE_RANGE_VERSION = '>=9.0.0-alpha';
-const NORMALIZED_WEB_COMPONENTS_PRERELEASE_RANGE_VERSION = '>=3.0.0-beta';
 const BEACHBALL_UNWANTED_PRERELEASE_RANGE_VERSION_REGEXP = /<9.0.0$/;
 
 export default async function (tree: Tree, schema: NormalizePackageDependenciesGeneratorSchema) {
@@ -128,9 +127,6 @@ function getVersion(tree: Tree, deps: Record<string, string>, packageName: strin
     }
 
     if (semver.prerelease(current)) {
-      if (semver.satisfies(current, NORMALIZED_WEB_COMPONENTS_PRERELEASE_RANGE_VERSION)) {
-        return current;
-      }
       return NORMALIZED_PRERELEASE_RANGE_VERSION;
     }