Skip to content

Commit

Permalink
react-tooltip: Migration to new DX (#18977)
Browse files Browse the repository at this point in the history
* react-tooltip migration to new DX

* Added change files for tooltip
  • Loading branch information
tringakrasniqi authored Jul 21, 2021
1 parent 1107e58 commit e2360de
Show file tree
Hide file tree
Showing 14 changed files with 85 additions and 28 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "none",
"comment": "react-tooltip migration to new DX",
"packageName": "@fluentui/react-tooltip",
"email": "[email protected]",
"dependentChangeType": "none"
}
1 change: 1 addition & 0 deletions jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,6 @@ module.exports = {
'<rootDir>/packages/make-styles-webpack-loader',
'<rootDir>/packages/react-avatar',
'<rootDir>/packages/react-shared-contexts',
'<rootDir>/packages/react-tooltip',
],
};
2 changes: 1 addition & 1 deletion nx.json
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
"@fluentui/react-text": { "tags": ["vNext", "platform:web"], "implicitDependencies": [] },
"@fluentui/react-theme": { "tags": ["vNext", "platform:web"], "implicitDependencies": [] },
"@fluentui/react-toggle": { "implicitDependencies": [] },
"@fluentui/react-tooltip": { "implicitDependencies": [] },
"@fluentui/react-tooltip": { "tags": ["vNext", "platform:web"], "implicitDependencies": [] },
"@fluentui/react-utilities": { "tags": ["vNext", "platform:web"], "implicitDependencies": [] },
"@fluentui/react-window-provider": { "implicitDependencies": [] },
"@fluentui/scheme-utilities": { "implicitDependencies": [] },
Expand Down
1 change: 0 additions & 1 deletion packages/react-examples/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@
"@fluentui/react-tabs": "^1.0.0-beta.128",
"@fluentui/react-theme": "^9.0.0-alpha.17",
"@fluentui/react-toggle": "^1.0.0-beta.126",
"@fluentui/react-tooltip": "^9.0.0-alpha.58",
"@fluentui/react-utilities": "^9.0.0-alpha.33",
"@fluentui/scheme-utilities": "^8.1.4",
"@fluentui/style-utilities": "^8.2.0",
Expand Down
11 changes: 11 additions & 0 deletions packages/react-tooltip/.storybook/main.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
const rootMain = require('../../../.storybook/main');

module.exports = /** @type {Pick<import('../../../.storybook/main').StorybookConfig,'addons'|'stories'|'webpackFinal'>} */ ({
stories: [...rootMain.stories, '../src/**/*.stories.mdx', '../src/**/*.stories.@(ts|tsx)'],
addons: [...rootMain.addons],
webpackFinal: (config, options) => {
const localConfig = { ...rootMain.webpackFinal(config, options) };

return localConfig;
},
});
7 changes: 7 additions & 0 deletions packages/react-tooltip/.storybook/preview.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import * as rootPreview from '../../../.storybook/preview';

/** @type {typeof rootPreview.decorators} */
export const decorators = [...rootPreview.decorators];

/** @type {typeof rootPreview.parameters} */
export const parameters = { ...rootPreview.parameters };
9 changes: 9 additions & 0 deletions packages/react-tooltip/.storybook/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"extends": "../tsconfig.json",
"compilerOptions": {
"allowJs": true,
"checkJs": true
},
"exclude": ["../**/*.test.ts", "../**/*.test.js", "../**/*.test.tsx", "../**/*.test.jsx"],
"include": ["../src/**/*", "*.js"]
}
1 change: 1 addition & 0 deletions packages/react-tooltip/config/api-extractor.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{
"$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
"extends": "@fluentui/scripts/api-extractor/api-extractor.common.json"
}
5 changes: 5 additions & 0 deletions packages/react-tooltip/config/api-extractor.local.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
"extends": "./api-extractor.json",
"mainEntryPointFilePath": "<projectFolder>/dist/<unscopedPackageName>/src/index.d.ts"
}
26 changes: 19 additions & 7 deletions packages/react-tooltip/jest.config.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,21 @@
const { createConfig } = require('@fluentui/scripts/jest/jest-resources');
const path = require('path');
// @ts-check

const config = createConfig({
setupFiles: [path.resolve(path.join(__dirname, 'config', 'tests.js'))],
/**
* @type {jest.InitialOptions}
*/
module.exports = {
displayName: 'react-tooltip',
preset: '../../jest.preset.js',
globals: {
'ts-jest': {
tsConfig: '<rootDir>/tsconfig.json',
diagnostics: false,
},
},
transform: {
'^.+\\.tsx?$': 'ts-jest',
},
coverageDirectory: './coverage',
setupFilesAfterEnv: ['./config/tests.js'],
snapshotSerializers: ['@fluentui/jest-serializer-make-styles'],
});

module.exports = config;
};
9 changes: 5 additions & 4 deletions packages/react-tooltip/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,11 @@
"code-style": "just-scripts code-style",
"just": "just-scripts",
"lint": "just-scripts lint",
"start": "just-scripts dev:storybook",
"start-test": "just-scripts jest-watch",
"test": "just-scripts test",
"update-snapshots": "just-scripts jest -u"
"start": "yarn storybook",
"test": "jest",
"docs": "api-extractor run --config=config/api-extractor.local.json --local",
"build:local": "tsc -p . --module esnext --emitDeclarationOnly && node ../../scripts/typescript/normalize-import --output dist/react-tooltip/src && yarn docs",
"storybook": "start-storybook"
},
"devDependencies": {
"@fluentui/babel-make-styles": "^9.0.0-alpha.28",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react';
import { Tooltip } from '@fluentui/react-tooltip';
import { Tooltip } from './index';
import { makeStyles } from '@fluentui/react-make-styles';

const useStyles = makeStyles({
Expand Down Expand Up @@ -166,3 +166,8 @@ export const OnlyIfTruncated = () => {
</>
);
};

export default {
title: 'Components/Tooltip',
component: Tooltip,
};
21 changes: 8 additions & 13 deletions packages/react-tooltip/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,22 +1,17 @@
{
"extends": "../../tsconfig.base.json",
"include": ["src"],
"compilerOptions": {
"baseUrl": ".",
"target": "ES5",
"module": "CommonJS",
"lib": ["es5", "dom"],
"outDir": "dist",
"target": "es5",
"module": "commonjs",
"jsx": "react",
"declaration": true,
"sourceMap": true,
"experimentalDecorators": true,
"importHelpers": true,
"noUnusedLocals": true,
"forceConsistentCasingInFileNames": true,
"strict": true,
"moduleResolution": "node",
"preserveConstEnums": true,
"lib": ["es5", "dom"],
"skipLibCheck": true,
"typeRoots": ["../../node_modules/@types", "../../typings"],
"types": ["jest", "custom-global"]
},
"include": ["src"]
"types": ["jest", "custom-global", "inline-style-expand-shorthand", "storybook__addons"]
}
}
6 changes: 5 additions & 1 deletion workspace.json
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,11 @@
"sourceRoot": "packages/react-theme/src"
},
"@fluentui/react-toggle": { "root": "packages/react-toggle", "projectType": "library" },
"@fluentui/react-tooltip": { "root": "packages/react-tooltip", "projectType": "library" },
"@fluentui/react-tooltip": {
"root": "packages/react-tooltip",
"projectType": "library",
"sourceRoot": "packages/react-tooltip/src"
},
"@fluentui/react-utilities": {
"root": "packages/react-utilities",
"projectType": "library",
Expand Down

0 comments on commit e2360de

Please sign in to comment.