From 38577e637827a97057e4511c7ab7ad2051a79f46 Mon Sep 17 00:00:00 2001 From: Martin Hochel Date: Tue, 31 Jan 2023 12:42:52 +0100 Subject: [PATCH 1/9] chore(fluentui/docs): enable build-less setup for VR tests --- packages/fluentui/docs/.storybook/main.js | 59 ++++++++++++-------- packages/fluentui/docs/.storybook/preview.js | 2 + packages/fluentui/docs/package.json | 1 + 3 files changed, 38 insertions(+), 24 deletions(-) diff --git a/packages/fluentui/docs/.storybook/main.js b/packages/fluentui/docs/.storybook/main.js index 66664d8a0eeec9..b73dec56a26e9a 100644 --- a/packages/fluentui/docs/.storybook/main.js +++ b/packages/fluentui/docs/.storybook/main.js @@ -1,10 +1,42 @@ +// @ts-check + const path = require('path'); -const { TsconfigPathsPlugin } = require('tsconfig-paths-webpack-plugin'); + +const { registerTsPaths, registerRules, rules } = require('@fluentui/scripts-storybook'); + +const tsConfigPath = path.resolve(__dirname, '../../../../tsconfig.base.v0.json'); module.exports = /** @type {import('../../../../.storybook/main').StorybookBaseConfig} */ ({ + addons: [ + { + name: 'storybook-addon-swc', + options: /** @type {import('storybook-addon-swc').StoryBookAddonSwcOptions} */ ({ + swcLoaderOptions: { + jsc: { + target: 'es2019', + parser: { + syntax: 'typescript', + tsx: true, + decorators: true, + dynamicImport: true, + }, + transform: { + decoratorMetadata: true, + legacyDecorator: true, + }, + keepClassNames: true, + externalHelpers: true, + loose: true, + }, + }, + swcMinifyOptions: { mangle: false }, + }), + }, + ], stories: ['../src/**/*.stories.tsx'], core: { builder: 'webpack5', + disableTelemetry: true, }, babel: {}, typescript: { @@ -12,29 +44,8 @@ module.exports = /** @type {import('../../../../.storybook/main').StorybookBaseC reactDocgen: false, }, webpackFinal: config => { - const tsPaths = new TsconfigPathsPlugin({ - configFile: path.resolve(__dirname, '../../../../tsconfig.base.json'), - }); - - if (config.resolve) { - config.resolve.plugins ? config.resolve.plugins.push(tsPaths) : (config.resolve.plugins = [tsPaths]); - } - - if (config.module) { - config.module.rules?.unshift({ - test: /\.(ts|tsx)$/, - use: [ - { - loader: '@griffel/webpack-loader', - options: { - babelOptions: { - presets: ['@babel/preset-typescript'], - }, - }, - }, - ], - }); - } + registerTsPaths({ config, configFile: tsConfigPath }); + registerRules({ config, rules: [rules.griffelRule] }); return config; }, diff --git a/packages/fluentui/docs/.storybook/preview.js b/packages/fluentui/docs/.storybook/preview.js index 1e6dfd9db0e93a..a053aad8c272bd 100644 --- a/packages/fluentui/docs/.storybook/preview.js +++ b/packages/fluentui/docs/.storybook/preview.js @@ -1,3 +1,5 @@ +// @ts-check + import * as React from 'react'; import { Provider, teamsTheme } from '@fluentui/react-northstar'; diff --git a/packages/fluentui/docs/package.json b/packages/fluentui/docs/package.json index 111fb7de2b14ef..5de523f5804544 100644 --- a/packages/fluentui/docs/package.json +++ b/packages/fluentui/docs/package.json @@ -53,6 +53,7 @@ "@fluentui/eslint-plugin": "*", "@fluentui/scripts-babel": "*", "@fluentui/scripts-gulp": "*", + "@fluentui/scripts-storybook": "*", "@types/classnames": "^2.2.9", "@types/color": "^3.0.0", "@types/faker": "^4.1.3", From f780c368c0e9ab634d8b250519189a1d0fe36a35 Mon Sep 17 00:00:00 2001 From: Martin Hochel Date: Tue, 31 Jan 2023 12:43:54 +0100 Subject: [PATCH 2/9] chore(apps/vr-tests-react-components): unify storybook setup with rest of VR apps --- .../.storybook/main.js | 60 +++++++++++-------- .../.storybook/manager.js | 2 + .../.storybook/preview.js | 2 + apps/vr-tests-react-components/package.json | 3 +- 4 files changed, 40 insertions(+), 27 deletions(-) diff --git a/apps/vr-tests-react-components/.storybook/main.js b/apps/vr-tests-react-components/.storybook/main.js index b8a83b5919fa87..0cf2731312a901 100644 --- a/apps/vr-tests-react-components/.storybook/main.js +++ b/apps/vr-tests-react-components/.storybook/main.js @@ -1,9 +1,38 @@ +// @ts-check + const path = require('path'); -const { TsconfigPathsPlugin } = require('tsconfig-paths-webpack-plugin'); -module.exports = /** @type {import('../../../.storybook/main').StorybookBaseConfig} */ ({ - addons: ['@fluentui/react-storybook-addon'], +const { registerTsPaths, registerRules, rules, loadWorkspaceAddon } = require('@fluentui/scripts-storybook'); +const tsConfigPath = path.resolve(__dirname, '../../../tsconfig.base.json'); +module.exports = /** @type {import('../../../.storybook/main').StorybookBaseConfig} */ ({ + addons: [ + { + name: 'storybook-addon-swc', + options: /** @type {import('storybook-addon-swc').StoryBookAddonSwcOptions} */ ({ + swcLoaderOptions: { + jsc: { + target: 'es2019', + parser: { + syntax: 'typescript', + tsx: true, + decorators: true, + dynamicImport: true, + }, + transform: { + decoratorMetadata: true, + legacyDecorator: true, + }, + keepClassNames: true, + externalHelpers: true, + loose: true, + }, + }, + swcMinifyOptions: { mangle: false }, + }), + }, + loadWorkspaceAddon('@fluentui/react-storybook-addon', { tsConfigPath }), + ], stories: ['../src/**/*.stories.tsx'], core: { builder: 'webpack5', @@ -15,29 +44,8 @@ module.exports = /** @type {import('../../../.storybook/main').StorybookBaseConf reactDocgen: false, }, webpackFinal: config => { - const tsPaths = new TsconfigPathsPlugin({ - configFile: path.resolve(__dirname, '../../../tsconfig.base.json'), - }); - - if (config.resolve) { - config.resolve.plugins ? config.resolve.plugins.push(tsPaths) : (config.resolve.plugins = [tsPaths]); - } - - if (config.module) { - config.module.rules?.unshift({ - test: /\.(ts|tsx)$/, - use: [ - { - loader: '@griffel/webpack-loader', - options: { - babelOptions: { - presets: ['@babel/preset-typescript'], - }, - }, - }, - ], - }); - } + registerTsPaths({ config, configFile: tsConfigPath }); + registerRules({ config, rules: [rules.griffelRule] }); return config; }, diff --git a/apps/vr-tests-react-components/.storybook/manager.js b/apps/vr-tests-react-components/.storybook/manager.js index 840a151b2d4131..3b7292756fab1a 100644 --- a/apps/vr-tests-react-components/.storybook/manager.js +++ b/apps/vr-tests-react-components/.storybook/manager.js @@ -1,3 +1,5 @@ +// @ts-check + import { addons } from '@storybook/addons'; import { create } from '@storybook/theming'; diff --git a/apps/vr-tests-react-components/.storybook/preview.js b/apps/vr-tests-react-components/.storybook/preview.js index 50e39889ee309f..32dfd46958c75d 100644 --- a/apps/vr-tests-react-components/.storybook/preview.js +++ b/apps/vr-tests-react-components/.storybook/preview.js @@ -1,3 +1,5 @@ +// @ts-check + import * as React from 'react'; import { setAddon } from '@storybook/react'; import { webLightTheme, teamsHighContrastTheme, webDarkTheme } from '@fluentui/react-theme'; diff --git a/apps/vr-tests-react-components/package.json b/apps/vr-tests-react-components/package.json index 58f9c5ae6ffa04..bfb4c97bac4a31 100644 --- a/apps/vr-tests-react-components/package.json +++ b/apps/vr-tests-react-components/package.json @@ -16,7 +16,8 @@ }, "devDependencies": { "@fluentui/eslint-plugin": "*", - "@fluentui/scripts-tasks": "*" + "@fluentui/scripts-tasks": "*", + "@fluentui/scripts-storybook": "*" }, "dependencies": { "@fluentui/react-accordion": "^9.0.25", From 3c47e8912842fc44ff937914f4ff75905770679a Mon Sep 17 00:00:00 2001 From: Martin Hochel Date: Tue, 31 Jan 2023 12:44:54 +0100 Subject: [PATCH 3/9] chore(apps/stress-test): enable build-less setup (except web-components) --- apps/stress-test/package.json | 3 ++- apps/stress-test/scripts/commands/build.ts | 2 +- apps/stress-test/webpack/webpack.config.ts | 13 +++++++------ 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/apps/stress-test/package.json b/apps/stress-test/package.json index a4cdc7a09fc32d..4d2296d5005a8d 100644 --- a/apps/stress-test/package.json +++ b/apps/stress-test/package.json @@ -21,6 +21,7 @@ "random-seedable": "1.0.8" }, "devDependencies": { - "@fluentui/scripts-tasks": "*" + "@fluentui/scripts-tasks": "*", + "@fluentui/scripts-storybook": "*" } } diff --git a/apps/stress-test/scripts/commands/build.ts b/apps/stress-test/scripts/commands/build.ts index 18f3c68dfe8f0e..768f66e94575dc 100644 --- a/apps/stress-test/scripts/commands/build.ts +++ b/apps/stress-test/scripts/commands/build.ts @@ -14,7 +14,7 @@ const command = 'build'; const run: (argv: CLIBuildOptions) => Promise = async argv => { if (argv.buildDeps) { - const deps = ['@fluentui/react', '@fluentui/web-components']; + const deps = ['@fluentui/web-components']; console.log('Building dependencies', deps.join(', ')); const cmd = `lage build --to ${deps.join(' ')} ${argv.verbose ? '--verbose' : ''}`; console.log(`Run: ${cmd}`); diff --git a/apps/stress-test/webpack/webpack.config.ts b/apps/stress-test/webpack/webpack.config.ts index 0082725a5112fd..e2ff29043c58b9 100644 --- a/apps/stress-test/webpack/webpack.config.ts +++ b/apps/stress-test/webpack/webpack.config.ts @@ -1,7 +1,8 @@ import * as path from 'path'; import { fileURLToPath } from 'url'; import { CleanWebpackPlugin } from 'clean-webpack-plugin'; -import { TsconfigPathsPlugin } from 'tsconfig-paths-webpack-plugin'; +// eslint-disable-next-line import/no-extraneous-dependencies +import { registerTsPaths, createPathAliasesConfig, rules } from '@fluentui/scripts-storybook'; import { configurePages } from './pageConfig.js'; import { configureGriffel } from './griffelConfig.js'; import * as WebpackDevServer from 'webpack-dev-server'; @@ -11,6 +12,8 @@ const enabledReactProfiling = true; const __dirname = path.dirname(fileURLToPath(import.meta.url)); +const { tsConfigAllPath } = createPathAliasesConfig(); + type WebpackArgs = { mode: 'production' | 'development' | 'none'; griffelMode: GriffelMode; @@ -38,14 +41,10 @@ const createConfig: WebpackConfigurationCreator = (_env, argv) => { 'scheduler/tracing': 'scheduler/tracing-profiling', }, extensions: ['.tsx', '.ts', '.js'], - plugins: [ - new TsconfigPathsPlugin({ - configFile: path.resolve(__dirname, '../../../tsconfig.base.json'), - }), - ], }, module: { rules: [ + rules.scssRule, { test: /\.(ts|tsx)?$/, exclude: /node_modules/, @@ -103,6 +102,8 @@ const createConfig: WebpackConfigurationCreator = (_env, argv) => { config = configureGriffel(config, argv.griffelMode); config = configurePages(config); + registerTsPaths({ config, configFile: tsConfigAllPath }); + return config; }; From 8015f0ce1e4232bb8c7a6583856558ab36894dfb Mon Sep 17 00:00:00 2001 From: Martin Hochel Date: Tue, 31 Jan 2023 12:45:48 +0100 Subject: [PATCH 4/9] chore(react-migration-v8-v9): enable build-less DX for storybook --- .../react-migration-v8-v9/.storybook/main.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/packages/react-components/react-migration-v8-v9/.storybook/main.js b/packages/react-components/react-migration-v8-v9/.storybook/main.js index f57cfd09509e78..66c095f852597c 100644 --- a/packages/react-components/react-migration-v8-v9/.storybook/main.js +++ b/packages/react-components/react-migration-v8-v9/.storybook/main.js @@ -1,14 +1,20 @@ +const { registerTsPaths, createPathAliasesConfig, registerRules, rules } = require('@fluentui/scripts-storybook'); const rootMain = require('../../../../.storybook/main'); +const { tsConfigAllPath } = createPathAliasesConfig(); + module.exports = /** @type {Omit} */ ({ ...rootMain, stories: [...rootMain.stories, '../src/**/*.stories.mdx', '../src/**/index.stories.@(ts|tsx)'], addons: [...rootMain.addons], webpackFinal: (config, options) => { - const localConfig = { ...rootMain.webpackFinal(config, options) }; + const localConfig = /** @type config */ ({ ...rootMain.webpackFinal(config, options) }); // add your own webpack tweaks if needed + registerTsPaths({ config: localConfig, configFile: tsConfigAllPath }); + registerRules({ config: localConfig, rules: [rules.scssRule] }); + return localConfig; }, }); From a58aa8cb46756a42755de5e89296080521e84f11 Mon Sep 17 00:00:00 2001 From: Martin Hochel Date: Tue, 31 Jan 2023 12:46:15 +0100 Subject: [PATCH 5/9] chore(react-migration-v0-v9): enable build-less DX for storybook --- .../react-migration-v0-v9/.storybook/main.js | 7 ++++++- .../react-components/react-migration-v0-v9/package.json | 7 +++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/packages/react-components/react-migration-v0-v9/.storybook/main.js b/packages/react-components/react-migration-v0-v9/.storybook/main.js index f57cfd09509e78..b8c4bd88724c9d 100644 --- a/packages/react-components/react-migration-v0-v9/.storybook/main.js +++ b/packages/react-components/react-migration-v0-v9/.storybook/main.js @@ -1,14 +1,19 @@ +const { registerTsPaths, createPathAliasesConfig } = require('@fluentui/scripts-storybook'); const rootMain = require('../../../../.storybook/main'); +const { tsConfigAllPath } = createPathAliasesConfig(); + module.exports = /** @type {Omit} */ ({ ...rootMain, stories: [...rootMain.stories, '../src/**/*.stories.mdx', '../src/**/index.stories.@(ts|tsx)'], addons: [...rootMain.addons], webpackFinal: (config, options) => { - const localConfig = { ...rootMain.webpackFinal(config, options) }; + const localConfig = /** @type config */ ({ ...rootMain.webpackFinal(config, options) }); // add your own webpack tweaks if needed + registerTsPaths({ config: localConfig, configFile: tsConfigAllPath }); + return localConfig; }, }); diff --git a/packages/react-components/react-migration-v0-v9/package.json b/packages/react-components/react-migration-v0-v9/package.json index c48d1dc6cb2887..568ccd30be1dd4 100644 --- a/packages/react-components/react-migration-v0-v9/package.json +++ b/packages/react-components/react-migration-v0-v9/package.json @@ -20,14 +20,17 @@ "lint": "just-scripts lint", "test": "jest --passWithNoTests", "type-check": "tsc -b tsconfig.json", - "generate-api": "tsc -p ./tsconfig.lib.json --emitDeclarationOnly && just-scripts api-extractor" + "generate-api": "tsc -p ./tsconfig.lib.json --emitDeclarationOnly && just-scripts api-extractor", + "storybook": "start-storybook", + "start": "yarn storybook" }, "devDependencies": { "@fluentui/eslint-plugin": "*", "@fluentui/react-conformance": "*", "@fluentui/react-conformance-griffel": "9.0.0-beta.19", "@fluentui/scripts-api-extractor": "*", - "@fluentui/scripts-tasks": "*" + "@fluentui/scripts-tasks": "*", + "@fluentui/scripts-storybook": "*" }, "dependencies": { "@fluentui/react-theme": "^9.1.5", From 909211e3ec86ff6e75b6c0ef0c7660f3642386b3 Mon Sep 17 00:00:00 2001 From: Martin Hochel Date: Wed, 1 Feb 2023 19:05:18 +0100 Subject: [PATCH 6/9] perf(apps/vr-tests): unify storybook setup with rest of VR apps and improve build speed --- apps/vr-tests/.storybook/main.js | 39 ++++++++++++++++++++-- apps/vr-tests/.storybook/manager.js | 2 ++ apps/vr-tests/package.json | 8 ++--- apps/vr-tests/src/stories/Icon.stories.tsx | 7 ++-- 4 files changed, 47 insertions(+), 9 deletions(-) diff --git a/apps/vr-tests/.storybook/main.js b/apps/vr-tests/.storybook/main.js index 4c45bc3c7a7c5e..122d47bdb3025e 100644 --- a/apps/vr-tests/.storybook/main.js +++ b/apps/vr-tests/.storybook/main.js @@ -1,6 +1,37 @@ -const { createStorybookWebpackConfig } = require('@fluentui/scripts-webpack'); +// @ts-check +const path = require('path'); +const { registerRules, registerTsPaths, rules } = require('@fluentui/scripts-storybook'); + +const tsConfigPath = path.resolve(__dirname, '../../../tsconfig.base.v8.json'); module.exports = /** @type {import('../../../.storybook/main').StorybookBaseConfig} */ ({ + addons: [ + { + name: 'storybook-addon-swc', + options: /** @type {import('storybook-addon-swc').StoryBookAddonSwcOptions} */ ({ + swcLoaderOptions: { + jsc: { + target: 'es2019', + parser: { + syntax: 'typescript', + tsx: true, + decorators: true, + dynamicImport: true, + }, + transform: { + decoratorMetadata: true, + legacyDecorator: true, + }, + keepClassNames: true, + externalHelpers: true, + loose: true, + }, + }, + swcMinifyOptions: { mangle: false }, + }), + }, + '@storybook/addon-actions', + ], stories: ['../src/**/*.stories.tsx'], core: { builder: 'webpack5', @@ -12,7 +43,9 @@ module.exports = /** @type {import('../../../.storybook/main').StorybookBaseConf reactDocgen: false, }, webpackFinal: config => { - return createStorybookWebpackConfig(config); + registerTsPaths({ config, configFile: tsConfigPath }); + registerRules({ config, rules: [rules.scssRule] }); + + return config; }, - addons: ['@storybook/addon-actions'], }); diff --git a/apps/vr-tests/.storybook/manager.js b/apps/vr-tests/.storybook/manager.js index 840a151b2d4131..3b7292756fab1a 100644 --- a/apps/vr-tests/.storybook/manager.js +++ b/apps/vr-tests/.storybook/manager.js @@ -1,3 +1,5 @@ +// @ts-check + import { addons } from '@storybook/addons'; import { create } from '@storybook/theming'; diff --git a/apps/vr-tests/package.json b/apps/vr-tests/package.json index a6102de43071b4..1c94557918ee15 100644 --- a/apps/vr-tests/package.json +++ b/apps/vr-tests/package.json @@ -4,19 +4,19 @@ "private": true, "description": "Visual regression tests for Fluent UI React", "scripts": { - "build": "just-scripts build", + "build": "build-storybook -o dist/storybook", "clean": "just-scripts clean", "code-style": "just-scripts code-style", "just": "just-scripts", "lint": "just-scripts lint", - "start": "just-scripts dev:storybook", + "start": "start-storybook -p 3000", "type-check": "tsc", - "vr:build": "cross-env NODE_OPTIONS=--max-old-space-size=3072 just-scripts storybook:build", + "vr:build": "yarn build", "vr:test": "storywright --browsers chromium --url dist/storybook --destpath dist/screenshots --waitTimeScreenshot 500 --concurrency 4 --headless true" }, "devDependencies": { "@fluentui/eslint-plugin": "*", - "@fluentui/scripts-webpack": "*", + "@fluentui/scripts-storybook": "*", "@fluentui/scripts-tasks": "*" }, "dependencies": { diff --git a/apps/vr-tests/src/stories/Icon.stories.tsx b/apps/vr-tests/src/stories/Icon.stories.tsx index 460643a9fdb4fe..2b8e8ea1a40b41 100644 --- a/apps/vr-tests/src/stories/Icon.stories.tsx +++ b/apps/vr-tests/src/stories/Icon.stories.tsx @@ -3,14 +3,17 @@ import { Steps, StoryWright } from 'storywright'; import { storiesOf } from '@storybook/react'; import { TestWrapperDecorator } from '../utilities/index'; import { Icon, IconType, getIconClassName, Fabric } from '@fluentui/react'; -import * as IconNames from '@fluentui/font-icons-mdl2/src/IconNames'; +import { IconNames } from '@fluentui/font-icons-mdl2'; import { TestImages } from '@fluentui/example-data'; // Rendering allIcons tests that the icon package can initialize all icons from the cdn const allIcons: JSX.Element[] = []; + +// eslint-disable-next-line @fluentui/max-len +// @ts-expect-error - IconNames is a const enum -> const' enums can only be used in property or index access expressions or the right hand side of an import declaration or export assignment or type query.ts(2475) // eslint-disable-next-line guard-for-in -for (const iconName in (IconNames as any).IconNames) { +for (const iconName in IconNames) { allIcons.push(); } From 5e6985dd9e4676bd937f0876b4dd6944f455b0ea Mon Sep 17 00:00:00 2001 From: Martin Hochel Date: Wed, 1 Feb 2023 19:10:08 +0100 Subject: [PATCH 7/9] generate change files --- ...gration-v8-v9-ca54b58c-216f-4a2c-bc44-b19249dd8d16.json | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 change/@fluentui-react-migration-v8-v9-ca54b58c-216f-4a2c-bc44-b19249dd8d16.json diff --git a/change/@fluentui-react-migration-v8-v9-ca54b58c-216f-4a2c-bc44-b19249dd8d16.json b/change/@fluentui-react-migration-v8-v9-ca54b58c-216f-4a2c-bc44-b19249dd8d16.json new file mode 100644 index 00000000000000..e559a82c4d869e --- /dev/null +++ b/change/@fluentui-react-migration-v8-v9-ca54b58c-216f-4a2c-bc44-b19249dd8d16.json @@ -0,0 +1,7 @@ +{ + "type": "none", + "comment": "chore: enable build-less DX for storybook", + "packageName": "@fluentui/react-migration-v8-v9", + "email": "martinhochel@microsoft.com", + "dependentChangeType": "none" +} From 4896097bf1fa6f3d78339b768900a30f7936133e Mon Sep 17 00:00:00 2001 From: Martin Hochel Date: Thu, 2 Feb 2023 09:27:22 +0100 Subject: [PATCH 8/9] chore: fix missing path aliases in v0,v8 tsconfigs --- tsconfig.base.v0.json | 2 +- tsconfig.base.v8.json | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/tsconfig.base.v0.json b/tsconfig.base.v0.json index 3a7df635c1cee1..28a91f73c33692 100644 --- a/tsconfig.base.v0.json +++ b/tsconfig.base.v0.json @@ -18,7 +18,7 @@ "typeRoots": ["node_modules/@types", "./typings"], "baseUrl": ".", "paths": { - "@fluentui/react-portal-compat-context": ["packages/react-components/react-portal-compat-context/src/index"], + "@fluentui/react-portal-compat-context": ["packages/react-components/react-portal-compat-context/src/index.ts"], "@fluentui/a11y-testing": ["packages/a11y-testing/src/index.ts"], "@fluentui/ability-attributes": ["packages/fluentui/ability-attributes/src/index.ts"], diff --git a/tsconfig.base.v8.json b/tsconfig.base.v8.json index ed9b496fec8e1d..3a92486049e158 100644 --- a/tsconfig.base.v8.json +++ b/tsconfig.base.v8.json @@ -11,6 +11,8 @@ "rootDir": ".", "baseUrl": ".", "paths": { + "@fluentui/react-portal-compat-context": ["packages/react-components/react-portal-compat-context/src/index.ts"], + "@fluentui/api-docs": ["packages/api-docs/src/index.ts"], "@fluentui/azure-themes": ["packages/azure-themes/src/index.ts"], "@fluentui/codemods": ["packages/codemods/src/index.ts"], From 57d65429f2d32f6d6fcedea265d4a2111319f785 Mon Sep 17 00:00:00 2001 From: Martin Hochel Date: Thu, 2 Feb 2023 09:32:25 +0100 Subject: [PATCH 9/9] chore(public-docsite-v9): normalize dependencies in package.json --- apps/public-docsite-v9/package.json | 2 -- apps/public-docsite-v9/src/shims/ThemeShim/themeDuplicates.ts | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/apps/public-docsite-v9/package.json b/apps/public-docsite-v9/package.json index bf29e0ba4f46a0..75e614b97283fa 100644 --- a/apps/public-docsite-v9/package.json +++ b/apps/public-docsite-v9/package.json @@ -27,10 +27,8 @@ "@fluentui/react": "^8.105.9", "@fluentui/react-northstar": "^0.66.1", "@fluentui/react-icons-northstar": "^0.66.1", - "@fluentui/storybook": "^1.0.0", "@fluentui/react-components": "^9.15.5", "@fluentui/react-storybook-addon": "9.0.0-rc.1", - "@fluentui/react-theme": "^9.1.5", "@griffel/react": "^1.5.2", "react": "17.0.2", "react-dom": "17.0.2", diff --git a/apps/public-docsite-v9/src/shims/ThemeShim/themeDuplicates.ts b/apps/public-docsite-v9/src/shims/ThemeShim/themeDuplicates.ts index c42e73c24d0b04..4f0c1bbff6c93e 100644 --- a/apps/public-docsite-v9/src/shims/ThemeShim/themeDuplicates.ts +++ b/apps/public-docsite-v9/src/shims/ThemeShim/themeDuplicates.ts @@ -3,7 +3,7 @@ * They are necessary to build the theme shims. */ -import { BrandVariants } from '@fluentui/react-theme'; +import { BrandVariants } from '@fluentui/react-components'; /** * Possible color variant values