From e1090b488d00e7bc3f23716172361fc6866d8c66 Mon Sep 17 00:00:00 2001 From: Martin Hochel Date: Tue, 28 Feb 2023 11:26:11 +0100 Subject: [PATCH 1/6] chore: disable manager chache on vr storybook production builds --- apps/vr-tests-react-components/package.json | 2 +- apps/vr-tests/package.json | 2 +- packages/fluentui/docs/package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/vr-tests-react-components/package.json b/apps/vr-tests-react-components/package.json index 3454308d5667d..af86bd2755dbb 100644 --- a/apps/vr-tests-react-components/package.json +++ b/apps/vr-tests-react-components/package.json @@ -4,7 +4,7 @@ "private": true, "description": "Visual regression tests for @fluentui/react-components", "scripts": { - "build": "build-storybook -o dist/storybook", + "build": "build-storybook --no-manager-cache -o dist/storybook", "clean": "just-scripts clean", "format": "prettier . -w --ignore-path ../../.prettierignore", "lint": "just-scripts lint", diff --git a/apps/vr-tests/package.json b/apps/vr-tests/package.json index 0b28f3ef0930e..64aafb2e007aa 100644 --- a/apps/vr-tests/package.json +++ b/apps/vr-tests/package.json @@ -4,7 +4,7 @@ "private": true, "description": "Visual regression tests for Fluent UI React", "scripts": { - "build": "build-storybook -o dist/storybook", + "build": "build-storybook --no-manager-cache -o dist/storybook", "clean": "just-scripts clean", "code-style": "just-scripts code-style", "just": "just-scripts", diff --git a/packages/fluentui/docs/package.json b/packages/fluentui/docs/package.json index 9abdbb6461bd8..80eee68a08b25 100644 --- a/packages/fluentui/docs/package.json +++ b/packages/fluentui/docs/package.json @@ -67,7 +67,7 @@ }, "scripts": { "build": "gulp build:docs", - "build:storybook": "build-storybook -o dist/storybook", + "build:storybook": "build-storybook --no-manager-cache -o dist/storybook", "lint": "eslint --ext .js,.ts,.tsx .", "lint:fix": "yarn lint --fix", "start": "gulp docs", From b1e6077e416493f1c627252514c70797d980d3be Mon Sep 17 00:00:00 2001 From: Martin Hochel Date: Tue, 28 Feb 2023 11:33:56 +0100 Subject: [PATCH 2/6] chore(react-components): remove unnecessary devDeps on workspace addon --- packages/react-components/react-components/package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/react-components/react-components/package.json b/packages/react-components/react-components/package.json index 1bdd745223d61..ee6de2d858708 100644 --- a/packages/react-components/react-components/package.json +++ b/packages/react-components/react-components/package.json @@ -26,7 +26,6 @@ }, "devDependencies": { "@fluentui/eslint-plugin": "*", - "@fluentui/react-storybook-addon": "9.0.0-rc.1", "react-hook-form": "^5.7.2", "@fluentui/scripts-api-extractor": "*", "@fluentui/scripts-tasks": "*" From 017bba76402aa8e8707aa47cb4677a8326e07548 Mon Sep 17 00:00:00 2001 From: Martin Hochel Date: Tue, 28 Feb 2023 11:34:26 +0100 Subject: [PATCH 3/6] feat(scripts-storybook): unify workspace addon loading for dev and prod builds --- scripts/storybook/src/utils.js | 4 ---- scripts/storybook/src/utils.spec.js | 14 -------------- 2 files changed, 18 deletions(-) diff --git a/scripts/storybook/src/utils.js b/scripts/storybook/src/utils.js index 91d945b25771c..cbbeb95df8f1f 100644 --- a/scripts/storybook/src/utils.js +++ b/scripts/storybook/src/utils.js @@ -32,10 +32,6 @@ function loadWorkspaceAddon(addonName, options) { /* eslint-disable no-shadow */ const { workspaceRoot, tsConfigPath } = { ...loadWorkspaceAddonDefaultOptions, ...options }; - if (process.env.NODE_ENV === 'production') { - return addonName; - } - function getPaths() { const workspaceJson = JSON.parse(fs.readFileSync(path.join(workspaceRoot, 'workspace.json'), 'utf-8')); const addonMetadata = workspaceJson.projects[addonName]; diff --git a/scripts/storybook/src/utils.spec.js b/scripts/storybook/src/utils.spec.js index 8bc2226faa55d..e2cefe1fb459b 100644 --- a/scripts/storybook/src/utils.spec.js +++ b/scripts/storybook/src/utils.spec.js @@ -85,20 +85,6 @@ describe(`utils`, () => { }; } - it(`should behave as identity function in prod env`, () => { - const originalEnv = process.env; - process.env = { ...originalEnv, NODE_ENV: 'production' }; - - const { tsConfigRoot } = setup({ packageName: 'storybook-custom-addon' }); - - const actual = loadWorkspaceAddon('@myorg/storybook-custom-addon', { tsConfigPath: tsConfigRoot }); - const expected = '@myorg/storybook-custom-addon'; - - expect(actual).toBe(expected); - - process.env = originalEnv; - }); - it(`should return path to in memory preset loader root`, () => { const { npmScope, workspaceRoot, tsConfigRoot } = setup({ packageName: 'storybook-custom-addon' }); From d781ca2a235f7fc47630b28ce8b37b6ba989f55c Mon Sep 17 00:00:00 2001 From: Martin Hochel Date: Tue, 28 Feb 2023 11:35:13 +0100 Subject: [PATCH 4/6] ci(vr): don't manually build workspace addon prior to run build-storybook for v9 tests --- azure-pipelines.vrt-baseline.yml | 2 +- azure-pipelines.vrt-pr.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.vrt-baseline.yml b/azure-pipelines.vrt-baseline.yml index f8b8c1b309663..d5ab3cdd834d4 100644 --- a/azure-pipelines.vrt-baseline.yml +++ b/azure-pipelines.vrt-baseline.yml @@ -26,7 +26,7 @@ jobs: fluentVersion: v9 vrTestPackageName: '@fluentui/vr-tests-react-components' vrTestPackagePath: 'apps/vr-tests-react-components' - shouldBuildstorybookaddon: true + shouldBuildstorybookaddon: false - bash: node node_modules/vrscreenshotdiff/lib/index.js release --clientType "fluentuiv9" --buildId $(Build.BuildId) displayName: 'Run Screenshotdiff update baseline' diff --git a/azure-pipelines.vrt-pr.yml b/azure-pipelines.vrt-pr.yml index 064756335ad18..163082bf79f1a 100644 --- a/azure-pipelines.vrt-pr.yml +++ b/azure-pipelines.vrt-pr.yml @@ -63,7 +63,7 @@ jobs: fluentVersion: v9 vrTestPackageName: '@fluentui/vr-tests-react-components' vrTestPackagePath: 'apps/vr-tests-react-components' - shouldBuildstorybookaddon: true + shouldBuildstorybookaddon: false - powershell: | $url = "https://dev.azure.com/uifabric/fabricpublic/_apis/build/builds?definitions=$env:BASELINE_PIPELINE_ID&statusFilter=completed&resultFilter=succeeded&queryOrder=finishTimeDescending&`$top=1" From a17deb8f21f42441764f6caa9cdef8e656923f9e Mon Sep 17 00:00:00 2001 From: Martin Hochel Date: Tue, 28 Feb 2023 11:40:35 +0100 Subject: [PATCH 5/6] generate changefile --- ...ct-components-efef013e-42c3-4754-ad30-88a5fc4354e7.json | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 change/@fluentui-react-components-efef013e-42c3-4754-ad30-88a5fc4354e7.json diff --git a/change/@fluentui-react-components-efef013e-42c3-4754-ad30-88a5fc4354e7.json b/change/@fluentui-react-components-efef013e-42c3-4754-ad30-88a5fc4354e7.json new file mode 100644 index 0000000000000..295957746d704 --- /dev/null +++ b/change/@fluentui-react-components-efef013e-42c3-4754-ad30-88a5fc4354e7.json @@ -0,0 +1,7 @@ +{ + "type": "none", + "comment": "chore: remove unnecessary devDeps on workspace addon", + "packageName": "@fluentui/react-components", + "email": "martinhochel@microsoft.com", + "dependentChangeType": "none" +} From 13853d5cdb45f443f5ee76d04233daeb1961f8fe Mon Sep 17 00:00:00 2001 From: Martin Hochel Date: Tue, 28 Feb 2023 11:46:14 +0100 Subject: [PATCH 6/6] ci(vr): don't manually build v0 prior to run build-storybook for v0 tests --- azure-pipelines.vrt-pr.yml | 2 +- packages/fluentui/docs/package.json | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/azure-pipelines.vrt-pr.yml b/azure-pipelines.vrt-pr.yml index 163082bf79f1a..663e7015a4c9c 100644 --- a/azure-pipelines.vrt-pr.yml +++ b/azure-pipelines.vrt-pr.yml @@ -227,7 +227,7 @@ jobs: vrTestPackageName: '@fluentui/docs' vrTestPackagePath: 'packages/fluentui/docs' shouldBuildstorybookaddon: false - shouldBuildNorthstar: true + shouldBuildNorthstar: false - powershell: | $url = "https://dev.azure.com/uifabric/fabricpublic/_apis/build/builds?definitions=$env:BASELINE_PIPELINE_ID&statusFilter=completed&resultFilter=succeeded&queryOrder=finishTimeDescending&`$top=1" diff --git a/packages/fluentui/docs/package.json b/packages/fluentui/docs/package.json index 80eee68a08b25..a1f41d334bbd7 100644 --- a/packages/fluentui/docs/package.json +++ b/packages/fluentui/docs/package.json @@ -67,11 +67,13 @@ }, "scripts": { "build": "gulp build:docs", + "prebuild:storybook": "lage build:info --to @fluentui/react-northstar @fluentui/react-component-ref @fluentui/react-bindings", "build:storybook": "build-storybook --no-manager-cache -o dist/storybook", "lint": "eslint --ext .js,.ts,.tsx .", "lint:fix": "yarn lint --fix", "start": "gulp docs", "start:profile": "cross-env NODE_ENV=production PERF=true gulp docs", + "prestart:storybook": "lage build:info --to @fluentui/react-northstar @fluentui/react-component-ref @fluentui/react-bindings", "start:storybook": "start-storybook", "vr:build": "yarn build:storybook", "vr:test": "storywright --browsers chromium --url dist/storybook --destpath dist/screenshots --waitTimeScreenshot 500 --concurrency 4 --headless true"