From f89aaf8c00eb39b5e0517a9ecc84220077466f11 Mon Sep 17 00:00:00 2001 From: David Zearing Date: Wed, 14 Sep 2022 09:54:09 -0700 Subject: [PATCH 1/6] Adding lib-commonjs entries. --- packages/react/package.json | 364 ++++++++++++++++++++++++++++++++++++ 1 file changed, 364 insertions(+) diff --git a/packages/react/package.json b/packages/react/package.json index 2a1274aa0659d..486109dd42502 100644 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -1042,6 +1042,370 @@ "import": "./lib/common/DocPage.types.js", "require": "./lib-commonjs/common/DocPage.types.js" }, + "./lib-commonjs/ActivityItem": { + "types": "./lib-commonjs/ActivityItem.d.ts", + "require": "./lib-commonjs/ActivityItem.js" + }, + "./lib-commonjs/Announced": { + "types": "./lib-commonjs/Announced.d.ts", + "require": "./lib-commonjs/Announced.js" + }, + "./lib-commonjs/Autofill": { + "types": "./lib-commonjs/Autofill.d.ts", + "require": "./lib-commonjs/Autofill.js" + }, + "./lib-commonjs/Breadcrumb": { + "types": "./lib-commonjs/Breadcrumb.d.ts", + "require": "./lib-commonjs/Breadcrumb.js" + }, + "./lib-commonjs/Button": { + "types": "./lib-commonjs/Button.d.ts", + "require": "./lib-commonjs/Button.js" + }, + "./lib-commonjs/ButtonGrid": { + "types": "./lib-commonjs/ButtonGrid.d.ts", + "require": "./lib-commonjs/ButtonGrid.js" + }, + "./lib-commonjs/Calendar": { + "types": "./lib-commonjs/Calendar.d.ts", + "require": "./lib-commonjs/Calendar.js" + }, + "./lib-commonjs/Callout": { + "types": "./lib-commonjs/Callout.d.ts", + "require": "./lib-commonjs/Callout.js" + }, + "./lib-commonjs/Check": { + "types": "./lib-commonjs/Check.d.ts", + "require": "./lib-commonjs/Check.js" + }, + "./lib-commonjs/Checkbox": { + "types": "./lib-commonjs/Checkbox.d.ts", + "require": "./lib-commonjs/Checkbox.js" + }, + "./lib-commonjs/ChoiceGroupOption": { + "types": "./lib-commonjs/ChoiceGroupOption.d.ts", + "require": "./lib-commonjs/ChoiceGroupOption.js" + }, + "./lib-commonjs/Coachmark": { + "types": "./lib-commonjs/Coachmark.d.ts", + "require": "./lib-commonjs/Coachmark.js" + }, + "./lib-commonjs/Color": { + "types": "./lib-commonjs/Color.d.ts", + "require": "./lib-commonjs/Color.js" + }, + "./lib-commonjs/ColorPicker": { + "types": "./lib-commonjs/ColorPicker.d.ts", + "require": "./lib-commonjs/ColorPicker.js" + }, + "./lib-commonjs/ComboBox": { + "types": "./lib-commonjs/ComboBox.d.ts", + "require": "./lib-commonjs/ComboBox.js" + }, + "./lib-commonjs/CommandBar": { + "types": "./lib-commonjs/CommandBar.d.ts", + "require": "./lib-commonjs/CommandBar.js" + }, + "./lib-commonjs/ContextualMenu": { + "types": "./lib-commonjs/ContextualMenu.d.ts", + "require": "./lib-commonjs/ContextualMenu.js" + }, + "./lib-commonjs/DatePicker": { + "types": "./lib-commonjs/DatePicker.d.ts", + "require": "./lib-commonjs/DatePicker.js" + }, + "./lib-commonjs/DateTimeUtilities": { + "types": "./lib-commonjs/DateTimeUtilities.d.ts", + "require": "./lib-commonjs/DateTimeUtilities.js" + }, + "./lib-commonjs/DetailsList": { + "types": "./lib-commonjs/DetailsList.d.ts", + "require": "./lib-commonjs/DetailsList.js" + }, + "./lib-commonjs/Dialog": { + "types": "./lib-commonjs/Dialog.d.ts", + "require": "./lib-commonjs/Dialog.js" + }, + "./lib-commonjs/Divider": { + "types": "./lib-commonjs/Divider.d.ts", + "require": "./lib-commonjs/Divider.js" + }, + "./lib-commonjs/DocumentCard": { + "types": "./lib-commonjs/DocumentCard.d.ts", + "require": "./lib-commonjs/DocumentCard.js" + }, + "./lib-commonjs/DragDrop": { + "types": "./lib-commonjs/DragDrop.d.ts", + "require": "./lib-commonjs/DragDrop.js" + }, + "./lib-commonjs/Dropdown": { + "types": "./lib-commonjs/Dropdown.d.ts", + "require": "./lib-commonjs/Dropdown.js" + }, + "./lib-commonjs/ExtendedPicker": { + "types": "./lib-commonjs/ExtendedPicker.d.ts", + "require": "./lib-commonjs/ExtendedPicker.js" + }, + "./lib-commonjs/Fabric": { + "types": "./lib-commonjs/Fabric.d.ts", + "require": "./lib-commonjs/Fabric.js" + }, + "./lib-commonjs/Facepile": { + "types": "./lib-commonjs/Facepile.d.ts", + "require": "./lib-commonjs/Facepile.js" + }, + "./lib-commonjs/FloatingPicker": { + "types": "./lib-commonjs/FloatingPicker.d.ts", + "require": "./lib-commonjs/FloatingPicker.js" + }, + "./lib-commonjs/FocusTrapZone": { + "types": "./lib-commonjs/FocusTrapZone.d.ts", + "require": "./lib-commonjs/FocusTrapZone.js" + }, + "./lib-commonjs/FocusZone": { + "types": "./lib-commonjs/FocusZone.d.ts", + "require": "./lib-commonjs/FocusZone.js" + }, + "./lib-commonjs/Grid": { + "types": "./lib-commonjs/Grid.d.ts", + "require": "./lib-commonjs/Grid.js" + }, + "./lib-commonjs/GroupedList": { + "types": "./lib-commonjs/GroupedList.d.ts", + "require": "./lib-commonjs/GroupedList.js" + }, + "./lib-commonjs/HoverCard": { + "types": "./lib-commonjs/HoverCard.d.ts", + "require": "./lib-commonjs/HoverCard.js" + }, + "./lib-commonjs/Icon": { + "types": "./lib-commonjs/Icon.d.ts", + "require": "./lib-commonjs/Icon.js" + }, + "./lib-commonjs/Icons": { + "types": "./lib-commonjs/Icons.d.ts", + "require": "./lib-commonjs/Icons.js" + }, + "./lib-commonjs/Image": { + "types": "./lib-commonjs/Image.d.ts", + "require": "./lib-commonjs/Image.js" + }, + "./lib-commonjs/Keytip": { + "types": "./lib-commonjs/Keytip.d.ts", + "require": "./lib-commonjs/Keytip.js" + }, + "./lib-commonjs/KeytipData": { + "types": "./lib-commonjs/KeytipData.d.ts", + "require": "./lib-commonjs/KeytipData.js" + }, + "./lib-commonjs/KeytipLayer": { + "types": "./lib-commonjs/KeytipLayer.d.ts", + "require": "./lib-commonjs/KeytipLayer.js" + }, + "./lib-commonjs/Keytips": { + "types": "./lib-commonjs/Keytips.d.ts", + "require": "./lib-commonjs/Keytips.js" + }, + "./lib-commonjs/Label": { + "types": "./lib-commonjs/Label.d.ts", + "require": "./lib-commonjs/Label.js" + }, + "./lib-commonjs/Layer": { + "types": "./lib-commonjs/Layer.d.ts", + "require": "./lib-commonjs/Layer.js" + }, + "./lib-commonjs/Link": { + "types": "./lib-commonjs/Link.d.ts", + "require": "./lib-commonjs/Link.js" + }, + "./lib-commonjs/List": { + "types": "./lib-commonjs/List.d.ts", + "require": "./lib-commonjs/List.js" + }, + "./lib-commonjs/MarqueeSelection": { + "types": "./lib-commonjs/MarqueeSelection.d.ts", + "require": "./lib-commonjs/MarqueeSelection.js" + }, + "./lib-commonjs/MessageBar": { + "types": "./lib-commonjs/MessageBar.d.ts", + "require": "./lib-commonjs/MessageBar.js" + }, + "./lib-commonjs/Modal": { + "types": "./lib-commonjs/Modal.d.ts", + "require": "./lib-commonjs/Modal.js" + }, + "./lib-commonjs/Nav": { + "types": "./lib-commonjs/Nav.d.ts", + "require": "./lib-commonjs/Nav.js" + }, + "./lib-commonjs/OverflowSet": { + "types": "./lib-commonjs/OverflowSet.d.ts", + "require": "./lib-commonjs/OverflowSet.js" + }, + "./lib-commonjs/Overlay": { + "types": "./lib-commonjs/Overlay.d.ts", + "require": "./lib-commonjs/Overlay.js" + }, + "./lib-commonjs/Panel": { + "types": "./lib-commonjs/Panel.d.ts", + "require": "./lib-commonjs/Panel.js" + }, + "./lib-commonjs/Persona": { + "types": "./lib-commonjs/Persona.d.ts", + "require": "./lib-commonjs/Persona.js" + }, + "./lib-commonjs/PersonaCoin": { + "types": "./lib-commonjs/PersonaCoin.d.ts", + "require": "./lib-commonjs/PersonaCoin.js" + }, + "./lib-commonjs/PersonaPresence": { + "types": "./lib-commonjs/PersonaPresence.d.ts", + "require": "./lib-commonjs/PersonaPresence.js" + }, + "./lib-commonjs/Pickers": { + "types": "./lib-commonjs/Pickers.d.ts", + "require": "./lib-commonjs/Pickers.js" + }, + "./lib-commonjs/Pivot": { + "types": "./lib-commonjs/Pivot.d.ts", + "require": "./lib-commonjs/Pivot.js" + }, + "./lib-commonjs/Popup": { + "types": "./lib-commonjs/Popup.d.ts", + "require": "./lib-commonjs/Popup.js" + }, + "./lib-commonjs/Positioning": { + "types": "./lib-commonjs/Positioning.d.ts", + "require": "./lib-commonjs/Positioning.js" + }, + "./lib-commonjs/PositioningContainer": { + "types": "./lib-commonjs/PositioningContainer.d.ts", + "require": "./lib-commonjs/PositioningContainer.js" + }, + "./lib-commonjs/ProgressIndicator": { + "types": "./lib-commonjs/ProgressIndicator.d.ts", + "require": "./lib-commonjs/ProgressIndicator.js" + }, + "./lib-commonjs/Rating": { + "types": "./lib-commonjs/Rating.d.ts", + "require": "./lib-commonjs/Rating.js" + }, + "./lib-commonjs/ResizeGroup": { + "types": "./lib-commonjs/ResizeGroup.d.ts", + "require": "./lib-commonjs/ResizeGroup.js" + }, + "./lib-commonjs/ResponsiveMode": { + "types": "./lib-commonjs/ResponsiveMode.d.ts", + "require": "./lib-commonjs/ResponsiveMode.js" + }, + "./lib-commonjs/ScrollablePane": { + "types": "./lib-commonjs/ScrollablePane.d.ts", + "require": "./lib-commonjs/ScrollablePane.js" + }, + "./lib-commonjs/SearchBox": { + "types": "./lib-commonjs/SearchBox.d.ts", + "require": "./lib-commonjs/SearchBox.js" + }, + "./lib-commonjs/SelectableOption": { + "types": "./lib-commonjs/SelectableOption.d.ts", + "require": "./lib-commonjs/SelectableOption.js" + }, + "./lib-commonjs/SelectedItemsList": { + "types": "./lib-commonjs/SelectedItemsList.d.ts", + "require": "./lib-commonjs/SelectedItemsList.js" + }, + "./lib-commonjs/Selection": { + "types": "./lib-commonjs/Selection.d.ts", + "require": "./lib-commonjs/Selection.js" + }, + "./lib-commonjs/Separator": { + "types": "./lib-commonjs/Separator.d.ts", + "require": "./lib-commonjs/Separator.js" + }, + "./lib-commonjs/Shimmer": { + "types": "./lib-commonjs/Shimmer.d.ts", + "require": "./lib-commonjs/Shimmer.js" + }, + "./lib-commonjs/ShimmeredDetailsList": { + "types": "./lib-commonjs/ShimmeredDetailsList.d.ts", + "require": "./lib-commonjs/ShimmeredDetailsList.js" + }, + "./lib-commonjs/Slider": { + "types": "./lib-commonjs/Slider.d.ts", + "require": "./lib-commonjs/Slider.js" + }, + "./lib-commonjs/SpinButton": { + "types": "./lib-commonjs/SpinButton.d.ts", + "require": "./lib-commonjs/SpinButton.js" + }, + "./lib-commonjs/Spinner": { + "types": "./lib-commonjs/Spinner.d.ts", + "require": "./lib-commonjs/Spinner.js" + }, + "./lib-commonjs/Stack": { + "types": "./lib-commonjs/Stack.d.ts", + "require": "./lib-commonjs/Stack.js" + }, + "./lib-commonjs/Sticky": { + "types": "./lib-commonjs/Sticky.d.ts", + "require": "./lib-commonjs/Sticky.js" + }, + "./lib-commonjs/Styling": { + "types": "./lib-commonjs/Styling.d.ts", + "require": "./lib-commonjs/Styling.js" + }, + "./lib-commonjs/SwatchColorPicker": { + "types": "./lib-commonjs/SwatchColorPicker.d.ts", + "require": "./lib-commonjs/SwatchColorPicker.js" + }, + "./lib-commonjs/TeachingBubble": { + "types": "./lib-commonjs/TeachingBubble.d.ts", + "require": "./lib-commonjs/TeachingBubble.js" + }, + "./lib-commonjs/Text": { + "types": "./lib-commonjs/Text.d.ts", + "require": "./lib-commonjs/Text.js" + }, + "./lib-commonjs/TextField": { + "types": "./lib-commonjs/TextField.d.ts", + "require": "./lib-commonjs/TextField.js" + }, + "./lib-commonjs/Theme": { + "types": "./lib-commonjs/Theme.d.ts", + "require": "./lib-commonjs/Theme.js" + }, + "./lib-commonjs/ThemeGenerator": { + "types": "./lib-commonjs/ThemeGenerator.d.ts", + "require": "./lib-commonjs/ThemeGenerator.js" + }, + "./lib-commonjs/TimePicker": { + "types": "./lib-commonjs/TimePicker.d.ts", + "require": "./lib-commonjs/TimePicker.js" + }, + "./lib-commonjs/Toggle": { + "types": "./lib-commonjs/Toggle.d.ts", + "require": "./lib-commonjs/Toggle.js" + }, + "./lib-commonjs/Tooltip": { + "types": "./lib-commonjs/Tooltip.d.ts", + "require": "./lib-commonjs/Tooltip.js" + }, + "./lib-commonjs/Utilities": { + "types": "./lib-commonjs/Utilities.d.ts", + "require": "./lib-commonjs/Utilities.js" + }, + "./lib-commonjs/version": { + "types": "./lib-commonjs/version.d.ts", + "require": "./lib-commonjs/version.js" + }, + "./lib-commonjs/WeeklyDayPicker": { + "types": "./lib-commonjs/WeeklyDayPicker.d.ts", + "require": "./lib-commonjs/WeeklyDayPicker.js" + }, + "./lib-commonjs/WindowProvider": { + "types": "./lib-commonjs/WindowProvider.d.ts", + "require": "./lib-commonjs/WindowProvider.js" + }, "./package.json": "./package.json" } } From 10e6d634b8c39dfa1c19e3e7b3908e8e73676ad4 Mon Sep 17 00:00:00 2001 From: David Zearing Date: Wed, 14 Sep 2022 09:55:15 -0700 Subject: [PATCH 2/6] change file. --- ...luentui-react-743e453a-27eb-4dbc-9715-a1eeeefa66e5.json | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 change/@fluentui-react-743e453a-27eb-4dbc-9715-a1eeeefa66e5.json diff --git a/change/@fluentui-react-743e453a-27eb-4dbc-9715-a1eeeefa66e5.json b/change/@fluentui-react-743e453a-27eb-4dbc-9715-a1eeeefa66e5.json new file mode 100644 index 0000000000000..3530a4f6c10be --- /dev/null +++ b/change/@fluentui-react-743e453a-27eb-4dbc-9715-a1eeeefa66e5.json @@ -0,0 +1,7 @@ +{ + "type": "minor", + "comment": "All /lib-commonjs/ top-level entries have been added to the exports map for backwards compatibility.", + "packageName": "@fluentui/react", + "email": "dzearing@microsoft.com", + "dependentChangeType": "patch" +} From 9235b0e2333185887f60ff8e0285f9e9d3538f6d Mon Sep 17 00:00:00 2001 From: David Zearing Date: Wed, 14 Sep 2022 10:01:59 -0700 Subject: [PATCH 3/6] Removing the postprocess commonjs task. --- scripts/just.config.ts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/scripts/just.config.ts b/scripts/just.config.ts index 6406ae09cd17b..f5c24179e0954 100644 --- a/scripts/just.config.ts +++ b/scripts/just.config.ts @@ -19,7 +19,6 @@ import { checkForModifiedFiles } from './tasks/check-for-modified-files'; import { generateVersionFiles } from './tasks/generate-version-files'; import { postprocessTask } from './tasks/postprocess'; import { postprocessAmdTask } from './tasks/postprocess-amd'; -import { postprocessCommonjsTask } from './tasks/postprocess-commonjs'; import { startStorybookTask, buildStorybookTask } from './tasks/storybook'; import { isConvergedPackage } from './monorepo'; import { getJustArgv } from './tasks/argv'; @@ -56,8 +55,7 @@ export function preset() { task('sass', sass()); task('ts:postprocess', postprocessTask()); task('postprocess:amd', postprocessAmdTask); - task('postprocess:commonjs', postprocessCommonjsTask); - task('ts:commonjs', series(ts.commonjs, 'postprocess:commonjs')); + task('ts:commonjs', ts.commonjs); task('ts:esm', ts.esm); task('ts:amd', series(ts.amd, 'postprocess:amd')); task('eslint', eslint); From 1aab3730c10b71c429488e9a81cd766b7096dfc4 Mon Sep 17 00:00:00 2001 From: David Zearing Date: Wed, 14 Sep 2022 13:19:48 -0700 Subject: [PATCH 4/6] updating change files. --- ...luentui-react-743e453a-27eb-4dbc-9715-a1eeeefa66e5.json | 2 +- ...eact-charting-743e453a-27eb-4dbc-9715-a1eeeefa66e5.json | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 change/@fluentui-react-charting-743e453a-27eb-4dbc-9715-a1eeeefa66e5.json diff --git a/change/@fluentui-react-743e453a-27eb-4dbc-9715-a1eeeefa66e5.json b/change/@fluentui-react-743e453a-27eb-4dbc-9715-a1eeeefa66e5.json index 3530a4f6c10be..c5f82860f23d9 100644 --- a/change/@fluentui-react-743e453a-27eb-4dbc-9715-a1eeeefa66e5.json +++ b/change/@fluentui-react-743e453a-27eb-4dbc-9715-a1eeeefa66e5.json @@ -3,5 +3,5 @@ "comment": "All /lib-commonjs/ top-level entries have been added to the exports map for backwards compatibility.", "packageName": "@fluentui/react", "email": "dzearing@microsoft.com", - "dependentChangeType": "patch" + "dependentChangeType": "minor" } diff --git a/change/@fluentui-react-charting-743e453a-27eb-4dbc-9715-a1eeeefa66e5.json b/change/@fluentui-react-charting-743e453a-27eb-4dbc-9715-a1eeeefa66e5.json new file mode 100644 index 0000000000000..974ee9f6cc06a --- /dev/null +++ b/change/@fluentui-react-charting-743e453a-27eb-4dbc-9715-a1eeeefa66e5.json @@ -0,0 +1,7 @@ +{ + "type": "minor", + "comment": "All /lib-commonjs/ top-level entries have been added to the exports map for backwards compatibility.", + "packageName": "@fluentui/react-charting", + "email": "dzearing@microsoft.com", + "dependentChangeType": "minor" +} From 351025abea58159d7337e4354dfd45b472582f4d Mon Sep 17 00:00:00 2001 From: David Zearing Date: Wed, 14 Sep 2022 15:57:09 -0700 Subject: [PATCH 5/6] failure in snapshot... --- .../HeatMapChart/__snapshots__/HeatMapChart.test.tsx.snap | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/react-charting/src/components/HeatMapChart/__snapshots__/HeatMapChart.test.tsx.snap b/packages/react-charting/src/components/HeatMapChart/__snapshots__/HeatMapChart.test.tsx.snap index a182b518be5a7..c153cafa51b24 100644 --- a/packages/react-charting/src/components/HeatMapChart/__snapshots__/HeatMapChart.test.tsx.snap +++ b/packages/react-charting/src/components/HeatMapChart/__snapshots__/HeatMapChart.test.tsx.snap @@ -122,7 +122,7 @@ exports[`HeatMapChart - mouse events Should render callout correctly on mouseove fill: #ffffff; font-family: 'Segoe UI', 'Segoe UI Web (West European)', 'Segoe UI', -apple-system, BlinkMacSystemFont, 'Roboto', 'Helvetica Neue', sans-serif; font-size: 14px; - font-weight: 400; + font-weight: 600; pointer-events: none; } dominantBaseline="middle" @@ -157,7 +157,7 @@ exports[`HeatMapChart - mouse events Should render callout correctly on mouseove fill: #ffffff; font-family: 'Segoe UI', 'Segoe UI Web (West European)', 'Segoe UI', -apple-system, BlinkMacSystemFont, 'Roboto', 'Helvetica Neue', sans-serif; font-size: 14px; - font-weight: 400; + font-weight: 600; pointer-events: none; } dominantBaseline="middle" From 54563279aecf6ed51b2a75f071a20cb88089684a Mon Sep 17 00:00:00 2001 From: David Zearing Date: Thu, 15 Sep 2022 10:18:57 -0700 Subject: [PATCH 6/6] Removing postprocess script. --- scripts/tasks/postprocess-commonjs.ts | 42 --------------------------- 1 file changed, 42 deletions(-) delete mode 100644 scripts/tasks/postprocess-commonjs.ts diff --git a/scripts/tasks/postprocess-commonjs.ts b/scripts/tasks/postprocess-commonjs.ts deleted file mode 100644 index 9be11e43d588a..0000000000000 --- a/scripts/tasks/postprocess-commonjs.ts +++ /dev/null @@ -1,42 +0,0 @@ -import { getAllPackageInfo } from '../monorepo/index'; - -export async function postprocessCommonjsTask() { - // Delay load these - const { mod } = await import('riceburn'); - const ts = await import('typescript'); - - const allPackages = Object.keys(getAllPackageInfo()); - - mod('lib-commonjs/**/*.{ts,js}').asTypescript((node, modder) => { - if (ts.isCallExpression(node)) { - if (node.expression.getText() === 'require' && node.arguments.length === 1) { - const arg = node.arguments[0]; - if (ts.isStringLiteral(arg)) { - if (packageInRepo(arg.text) && arg.text.includes('/lib/')) { - return modder.replace(arg, `"${arg.text.replace('/lib/', '/lib-commonjs/')}"`); - } - } - } - } - - if (ts.isExportDeclaration(node) && node.moduleSpecifier) { - // const arg = node.arguments[0]; - const originalPath = node.moduleSpecifier.getText(); - const pathWithoutQuotes = originalPath.slice(1, originalPath.length - 1); - - if (packageInRepo(pathWithoutQuotes) && pathWithoutQuotes.includes('/lib/')) { - return modder.replace(node.moduleSpecifier, originalPath.replace('/lib/', '/lib-commonjs/')); - } - } - }); - - function packageInRepo(requireArg) { - for (let packageName of allPackages) { - if (requireArg === packageName || requireArg.startsWith(packageName + '/')) { - return true; - } - } - - return false; - } -}