react-make-styles: Migrate to new DX.

change/@fluentui-react-examples-8474c864-aca4-4d2a-b6f0-215b1da91886.json

@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "Remove @fluentui/react-make-styles from @fluentui/react-examples.",
+  "packageName": "@fluentui/react-examples",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}

change/@fluentui-react-make-styles-e3ca26e1-8f64-4740-8ca9-b13472c35b96.json

@@ -0,0 +1,7 @@
+{
+  "type": "prerelease",
+  "comment": "react-make-styles: Migrate to new DX.",
+  "packageName": "@fluentui/react-make-styles",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}

jest.config.js

@@ -14,5 +14,6 @@ module.exports = {
     '<rootDir>/packages/react-divider',
     '<rootDir>/packages/react-label',
     '<rootDir>/packages/make-styles',
+    '<rootDir>/packages/react-make-styles',
   ],
 };

nx.json

@@ -101,7 +101,7 @@
     "@fluentui/react-image": { "tags": ["vNext", "platform:web"], "implicitDependencies": [] },
     "@fluentui/react-input": { "implicitDependencies": [] },
     "@fluentui/react-link": { "tags": ["vNext", "platform:web"], "implicitDependencies": [] },
-    "@fluentui/react-make-styles": { "implicitDependencies": [] },
+    "@fluentui/react-make-styles": { "tags": ["vNext", "platform:web"], "implicitDependencies": [] },
     "@fluentui/react-menu": { "tags": ["vNext"], "implicitDependencies": [] },
     "@fluentui/react-monaco-editor": { "implicitDependencies": [] },
     "@fluentui/react-portal": { "tags": ["vNext"], "implicitDependencies": [] },

packages/react-examples/package.json

@@ -51,7 +51,6 @@
     "@fluentui/react-focus": "^8.1.5",
     "@fluentui/react-hooks": "^8.2.3",
     "@fluentui/react-icons-mdl2": "^1.1.4",
-    "@fluentui/react-make-styles": "^9.0.0-alpha.42",
     "@fluentui/react-menu": "^9.0.0-alpha.40",
     "@fluentui/react-provider": "^9.0.0-alpha.47",
     "@fluentui/react-shared-contexts": "^9.0.0-alpha.15",

packages/react-make-styles/.storybook/main.js

@@ -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;
+  },
+});

packages/react-make-styles/.storybook/preview.js

@@ -0,0 +1,3 @@
+import * as rootPreview from '../../../.storybook/preview';
+
+export const decorators = [...rootPreview.decorators];

packages/react-make-styles/.storybook/tsconfig.json

@@ -0,0 +1,9 @@
+{
+  "extends": "../tsconfig.json",
+  "compilerOptions": {
+    "allowJs": true,
+    "checkJs": true
+  },
+  "exclude": ["../**/*.test.ts", "../**/*.test.js", "../**/*.test.tsx", "../**/*.test.jsx"],
+  "include": ["../src/**/*", "*.js"]
+}

packages/react-make-styles/config/api-extractor.json

@@ -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"
 }

packages/react-make-styles/config/api-extractor.local.json

@@ -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"
+}

packages/react-make-styles/config/tests.js

@@ -0,0 +1 @@
+/** Jest test setup file. */

packages/react-make-styles/jest.config.js

@@ -1,5 +1,20 @@
-const { createConfig } = require('@fluentui/scripts/jest/jest-resources');
+// @ts-check
 
-const config = createConfig();
-
-module.exports = config;
+/**
+ * @type {jest.InitialOptions}
+ */
+module.exports = {
+  displayName: 'react-make-styles',
+  preset: '../../jest.preset.js',
+  globals: {
+    'ts-jest': {
+      tsConfig: '<rootDir>/tsconfig.json',
+      diagnostics: false,
+    },
+  },
+  transform: {
+    '^.+\\.tsx?$': 'ts-jest',
+  },
+  coverageDirectory: './coverage',
+  setupFilesAfterEnv: ['./config/tests.js'],
+};

packages/react-make-styles/package.json

@@ -18,9 +18,11 @@
     "code-style": "just-scripts code-style",
     "just": "just-scripts",
     "lint": "just-scripts lint",
-    "test": "just-scripts test",
-    "start": "just-scripts dev:storybook",
-    "start-test": "just-scripts jest-watch"
+    "test": "jest",
+    "start": "yarn storybook",
+    "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-make-styles/src && yarn docs",
+    "storybook": "start-storybook"
   },
   "devDependencies": {
     "@fluentui/eslint-plugin": "^1.3.1",

packages/react-examples/src/react-make-styles/Basic/Basic.stories.tsx → packages/react-make-styles/src/Basic.stories.tsx

@@ -1,4 +1,6 @@
-import { makeStyles, mergeClasses } from '@fluentui/react-make-styles';
+import { makeStyles, mergeClasses } from './index';
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-ignore - (see https://github.com/microsoft/fluentui/pull/18695#issuecomment-868432982)
 import { FluentProvider } from '@fluentui/react-provider';
 import { webLightTheme, teamsLightTheme } from '@fluentui/react-theme';
 import * as React from 'react';
@@ -92,3 +94,8 @@ export const Frame = () => (
     )}
   </PortalFrame>
 );
+
+export default {
+  title: 'Components/Basic',
+  component: Basic,
+};

packages/react-examples/src/react-make-styles/RTL/RTL.stories.tsx → packages/react-make-styles/src/RTL.stories.tsx

@@ -1,4 +1,6 @@
-import { makeStyles, mergeClasses } from '@fluentui/react-make-styles';
+import { makeStyles, mergeClasses } from './index';
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-ignore - (see https://github.com/microsoft/fluentui/pull/18695#issuecomment-868432982)
 import { FluentProvider } from '@fluentui/react-provider';
 import { webLightTheme } from '@fluentui/react-theme';
 import * as React from 'react';
@@ -87,3 +89,8 @@ export const Nested = () => (
     </FluentProvider>
   </>
 );
+
+export default {
+  title: 'Components/RTL',
+  component: RTL,
+};

packages/react-make-styles/tsconfig.json

@@ -1,22 +1,17 @@
 {
+  "extends": "../../tsconfig.base.json",
+  "include": ["src"],
   "compilerOptions": {
-    "baseUrl": ".",
+    "target": "ES5",
+    "module": "CommonJS",
+    "lib": ["ES2015", "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"],
-    "typeRoots": ["../../node_modules/@types", "../../typings"],
-    "types": ["custom-global", "jest"]
-  },
-  "include": ["src"]
+    "types": ["jest", "custom-global", "inline-style-expand-shorthand"]
+  }
 }

workspace.json

@@ -136,7 +136,11 @@
       "projectType": "library",
       "sourceRoot": "packages/react-link/src"
     },
-    "@fluentui/react-make-styles": { "root": "packages/react-make-styles", "projectType": "library" },
+    "@fluentui/react-make-styles": {
+      "root": "packages/react-make-styles",
+      "projectType": "library",
+      "sourceRoot": "packages/react-make-styles/src"
+    },
     "@fluentui/react-menu": {
       "root": "packages/react-menu",
       "projectType": "library",