Skip to content

Commit

Permalink
fixup! feat(react-storybook): init new package for convergence storyb…
Browse files Browse the repository at this point in the history
…ooks configuration
  • Loading branch information
Hotell committed Apr 22, 2021
1 parent db356ce commit 0a66c18
Show file tree
Hide file tree
Showing 13 changed files with 35 additions and 31 deletions.
2 changes: 1 addition & 1 deletion jest.config.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module.exports = {
projects: ['<rootDir>/packages/react-menu'],
projects: ['<rootDir>/packages/react-menu', '<rootDir>/packages/react-storybook'],
};
27 changes: 20 additions & 7 deletions packages/react-storybook/jest.config.js
Original file line number Diff line number Diff line change
@@ -1,8 +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'))],
});

module.exports = config;
/**
* @type {jest.InitialOptions}
*/
module.exports = {
displayName: 'react-menu',
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'],
};
12 changes: 4 additions & 8 deletions packages/react-storybook/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "@fluentui/react-storybook",
"version": "9.0.0-alpha.0",
"private": true,
"description": "Fluentui react storybook addons and utils",
"description": "Storybook addons and utils for Fluent UI React",
"main": "lib-commonjs/index.js",
"module": "lib/index.js",
"typings": "lib/index.d.ts",
Expand All @@ -19,9 +19,9 @@
"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-test": "echo \"This is DEPRECATED instead use 'test --watch'\" && just-scripts jest-watch",
"test": "jest",
"update-snapshots": "echo \"This is DEPRECATED instead use 'test -u'\" && just-scripts jest -u"
},
"devDependencies": {
"@fluentui/eslint-plugin": "^1.1.0",
Expand All @@ -32,13 +32,9 @@
"dependencies": {
"@fluentui/react-provider": "^9.0.0-alpha.25",
"@fluentui/react-theme": "^9.0.0-alpha.8",
"@fluentui/react-theme-provider": "^9.0.0-alpha.24",
"@fluentui/theme": "^2.0.4",
"@storybook/addon-knobs": "6.0.28",
"@storybook/addon-essentials": "6.0.28",
"@storybook/addons": "6.0.28",
"@fluentui/azure-themes": "^8.0.30",
"@fluentui/theme-samples": "^8.0.28",
"tslib": "^1.10.0"
},
"peerDependencies": {
Expand Down
2 changes: 2 additions & 0 deletions packages/react-storybook/src/decorators/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
export * from './withFluentProvider';
export * from './withStrictMode';
3 changes: 1 addition & 2 deletions packages/react-storybook/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
// TODO: replace with real exports
export {};
export * from './decorators';
13 changes: 4 additions & 9 deletions packages/react-storybook/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,21 +1,16 @@
{
"extends": "../../tsconfig.base.json",
"compilerOptions": {
"baseUrl": ".",
"outDir": "dist",
"target": "es5",
"module": "commonjs",
"module": "CommonJS",
"lib": ["ES2015", "dom"],
"outDir": "dist",
"jsx": "react",
"declaration": true,
"sourceMap": 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"]
Expand Down
4 changes: 1 addition & 3 deletions packages/storybook/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,8 @@
"react": "16.8.6"
},
"dependencies": {
"@fluentui/react-storybook": "^9.0.0-alpha.0",
"@fluentui/react": "^8.11.2",
"@fluentui/react-provider": "^9.0.0-alpha.25",
"@fluentui/react-theme": "^9.0.0-alpha.8",
"@fluentui/react-theme-provider": "^9.0.0-alpha.24",
"@fluentui/theme": "^2.0.4",
"@storybook/addon-knobs": "6.0.28",
"@storybook/addon-essentials": "6.0.28",
Expand Down
1 change: 1 addition & 0 deletions packages/storybook/src/index.ts
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
export * from './decorators/index';
export { withFluentProvider, withStrictMode } from '@fluentui/react-storybook';
2 changes: 1 addition & 1 deletion tsconfig.base.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"@fluentui/react-positioning": ["packages/react-positioning/src/index.ts"],
"@fluentui/react-shared-contexts": ["packages/react-shared-contexts/src/index.ts"],
"@fluentui/react-menu": ["packages/react-menu/src/index.ts"],
"@fluentui/storybook": ["packages/storybook/src/index.ts"]
"@fluentui/react-storybook": ["packages/react-storybook/src/index.ts"]
}
},
"exclude": ["node_modules"]
Expand Down

0 comments on commit 0a66c18

Please sign in to comment.