From bf722c9a21f793670930dbbc3b6a630d9f824588 Mon Sep 17 00:00:00 2001 From: Miroslav Stastny Date: Tue, 14 Feb 2023 12:14:15 +0100 Subject: [PATCH 1/2] fix(build): configure path to tokens package --- packages/web-components/.storybook/main.cjs | 7 +++++++ packages/web-components/tsconfig.json | 6 +++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/packages/web-components/.storybook/main.cjs b/packages/web-components/.storybook/main.cjs index cfe2fcd503e190..4149b34bc50eeb 100644 --- a/packages/web-components/.storybook/main.cjs +++ b/packages/web-components/.storybook/main.cjs @@ -1,4 +1,6 @@ const CircularDependencyPlugin = require('circular-dependency-plugin'); +const path = require('path'); +const { TsconfigPathsPlugin } = require('tsconfig-paths-webpack-plugin'); const tsBin = require.resolve('typescript'); @@ -24,6 +26,11 @@ module.exports = /** @type {Omit { + const tsPaths = new TsconfigPathsPlugin({ + configFile: path.resolve(__dirname, '../tsconfig.json'), + }); + config.resolve.plugins ? config.resolve.plugins.push(tsPaths) : (config.resolve.plugins = [tsPaths]); + config.resolve.extensionAlias = { '.js': ['.ts', '.js'], '.mjs': ['.mts', '.mjs'], diff --git a/packages/web-components/tsconfig.json b/packages/web-components/tsconfig.json index ec8a5a05955918..0ffbd5cbf4e359 100644 --- a/packages/web-components/tsconfig.json +++ b/packages/web-components/tsconfig.json @@ -14,7 +14,11 @@ "skipLibCheck": true, "importHelpers": true, "types": ["node", "mocha", "webpack-env"], - "lib": ["DOM", "ES2015", "ES2016.Array.Include"] + "lib": ["DOM", "ES2015", "ES2016.Array.Include"], + "baseUrl": "../..", + "paths": { + "@fluentui/tokens": ["packages/tokens/src/index.ts"] + } }, "include": ["src"] } From 6ce9e33309cbd6012f2a7a8be790a33b895a3b3c Mon Sep 17 00:00:00 2001 From: Miroslav Stastny Date: Tue, 14 Feb 2023 12:16:30 +0100 Subject: [PATCH 2/2] changefile --- ...eb-components-76d84908-f96c-4637-a826-cc63b8a4798e.json | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 change/@fluentui-web-components-76d84908-f96c-4637-a826-cc63b8a4798e.json diff --git a/change/@fluentui-web-components-76d84908-f96c-4637-a826-cc63b8a4798e.json b/change/@fluentui-web-components-76d84908-f96c-4637-a826-cc63b8a4798e.json new file mode 100644 index 00000000000000..ec99d42867e057 --- /dev/null +++ b/change/@fluentui-web-components-76d84908-f96c-4637-a826-cc63b8a4798e.json @@ -0,0 +1,7 @@ +{ + "type": "none", + "comment": "chore: fix package paths", + "packageName": "@fluentui/web-components", + "email": "miroslav.stastny@microsoft.com", + "dependentChangeType": "none" +}