From b7717903902d4995f9fa1721af01c444847005e0 Mon Sep 17 00:00:00 2001 From: Oleksandr Fediashov Date: Mon, 19 Jul 2021 17:36:26 +0200 Subject: [PATCH] chore(react-shared-contexts): migrate to new DX (#18998) * chore(react-shared-contexts): migrate to new DX * Change files --- ...-83896c52-ee1a-455c-a947-bc4422289130.json | 7 ++++++ jest.config.js | 1 + nx.json | 2 +- .../config/api-extractor.json | 1 + .../config/api-extractor.local.json | 5 ++++ packages/react-shared-contexts/jest.config.js | 25 +++++++++++++++---- packages/react-shared-contexts/package.json | 5 ++-- packages/react-shared-contexts/tsconfig.json | 18 +++++-------- workspace.json | 6 ++++- 9 files changed, 49 insertions(+), 21 deletions(-) create mode 100644 change/@fluentui-react-shared-contexts-83896c52-ee1a-455c-a947-bc4422289130.json create mode 100644 packages/react-shared-contexts/config/api-extractor.local.json diff --git a/change/@fluentui-react-shared-contexts-83896c52-ee1a-455c-a947-bc4422289130.json b/change/@fluentui-react-shared-contexts-83896c52-ee1a-455c-a947-bc4422289130.json new file mode 100644 index 00000000000000..3dd4bff58f4bdd --- /dev/null +++ b/change/@fluentui-react-shared-contexts-83896c52-ee1a-455c-a947-bc4422289130.json @@ -0,0 +1,7 @@ +{ + "type": "none", + "comment": "migrate to new DX", + "packageName": "@fluentui/react-shared-contexts", + "email": "olfedias@microsoft.com", + "dependentChangeType": "none" +} diff --git a/jest.config.js b/jest.config.js index f8e81fbc426d0f..637ea6f855f098 100644 --- a/jest.config.js +++ b/jest.config.js @@ -29,5 +29,6 @@ module.exports = { '/packages/react-slider', '/packages/make-styles-webpack-loader', '/packages/react-avatar', + '/packages/react-shared-contexts', ], }; diff --git a/nx.json b/nx.json index 4c7ba658614432..4f362514d12d11 100644 --- a/nx.json +++ b/nx.json @@ -106,7 +106,7 @@ "@fluentui/react-portal": { "tags": ["vNext"], "implicitDependencies": [] }, "@fluentui/react-positioning": { "tags": ["vNext"], "implicitDependencies": [] }, "@fluentui/react-provider": { "tags": ["vNext", "platform:web"], "implicitDependencies": [] }, - "@fluentui/react-shared-contexts": { "implicitDependencies": [] }, + "@fluentui/react-shared-contexts": { "tags": ["vNext", "platform:web"], "implicitDependencies": [] }, "@fluentui/react-storybook": { "implicitDependencies": [] }, "@fluentui/react-tabs": { "implicitDependencies": [] }, "@fluentui/react-tabster": { "tags": ["vNext", "platform:web"], "implicitDependencies": [] }, diff --git a/packages/react-shared-contexts/config/api-extractor.json b/packages/react-shared-contexts/config/api-extractor.json index c8406ab42ca3cc..f890ae360b7f7f 100644 --- a/packages/react-shared-contexts/config/api-extractor.json +++ b/packages/react-shared-contexts/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" } diff --git a/packages/react-shared-contexts/config/api-extractor.local.json b/packages/react-shared-contexts/config/api-extractor.local.json new file mode 100644 index 00000000000000..c2ea401c1c3685 --- /dev/null +++ b/packages/react-shared-contexts/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": "/dist//src/index.d.ts" +} diff --git a/packages/react-shared-contexts/jest.config.js b/packages/react-shared-contexts/jest.config.js index 5de821321c5000..03c8c206b6acd6 100644 --- a/packages/react-shared-contexts/jest.config.js +++ b/packages/react-shared-contexts/jest.config.js @@ -1,5 +1,20 @@ -let path = require('path'); -let { createConfig } = require('@fluentui/scripts/jest/jest-resources'); -module.exports = createConfig({ - setupFiles: [path.resolve(path.join(__dirname, 'config', 'tests.js'))], -}); +// @ts-check + +/** + * @type {jest.InitialOptions} + */ +module.exports = { + displayName: 'react-shared-contexts', + preset: '../../jest.preset.js', + globals: { + 'ts-jest': { + tsConfig: '/tsconfig.json', + diagnostics: false, + }, + }, + transform: { + '^.+\\.tsx?$': 'ts-jest', + }, + coverageDirectory: './coverage', + setupFilesAfterEnv: ['./config/tests.js'], +}; diff --git a/packages/react-shared-contexts/package.json b/packages/react-shared-contexts/package.json index 35b897a9e90438..25355a1919ba21 100644 --- a/packages/react-shared-contexts/package.json +++ b/packages/react-shared-contexts/package.json @@ -17,8 +17,9 @@ "code-style": "just-scripts code-style", "just": "just-scripts", "lint": "just-scripts lint", - "start-test": "just-scripts jest-watch", - "update-snapshots": "just-scripts jest -u" + "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-shared-contexts/src && yarn docs", + "test": "jest --passWithNoTests" }, "devDependencies": { "@fluentui/eslint-plugin": "^1.3.2", diff --git a/packages/react-shared-contexts/tsconfig.json b/packages/react-shared-contexts/tsconfig.json index a398937cd1edb4..160a36a7d662bf 100644 --- a/packages/react-shared-contexts/tsconfig.json +++ b/packages/react-shared-contexts/tsconfig.json @@ -1,23 +1,17 @@ { + "extends": "../../tsconfig.base.json", + "include": ["src"], "compilerOptions": { - "target": "es5", - "outDir": "lib", - "module": "commonjs", + "target": "ES5", + "module": "CommonJS", "lib": ["es5", "dom"], + "outDir": "dist", "jsx": "react", "declaration": true, - "sourceMap": true, "experimentalDecorators": true, "importHelpers": true, - "noImplicitAny": true, "noUnusedLocals": true, - "strictNullChecks": true, - "forceConsistentCasingInFileNames": true, - "moduleResolution": "node", "preserveConstEnums": true, - "skipLibCheck": true, - "typeRoots": ["../../node_modules/@types", "../../typings"], "types": ["jest", "custom-global"] - }, - "include": ["src"] + } } diff --git a/workspace.json b/workspace.json index c7736023e16c30..306de2c12bb61a 100644 --- a/workspace.json +++ b/workspace.json @@ -183,7 +183,11 @@ "projectType": "library", "sourceRoot": "packages/react-provider/src" }, - "@fluentui/react-shared-contexts": { "root": "packages/react-shared-contexts", "projectType": "library" }, + "@fluentui/react-shared-contexts": { + "root": "packages/react-shared-contexts", + "projectType": "library", + "sourceRoot": "packages/react-shared-contexts/src" + }, "@fluentui/react-storybook": { "root": "packages/react-storybook", "projectType": "library" }, "@fluentui/react-tabs": { "root": "packages/react-tabs", "projectType": "library" }, "@fluentui/react-tabster": {