Skip to content

Vite fixes (default exports, circular dependency) #24591

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ryanclark merged 4 commits into from
Apr 14, 2023
Merged

Vite fixes (default exports, circular dependency) #24591

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6587d34
Fix Vite production build with react-day-picker
ryanclark Apr 14, 2023
f97e624
Fix circular dependency
ryanclark Apr 14, 2023
9ce6578
Remove unneeded typings
ryanclark Apr 14, 2023
1133d7c
Use an esmodule interop instead of Vite config
ryanclark Apr 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion web/packages/teleport/src/Discover/Discover.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import { Box } from 'design';
import { FeatureBox } from 'teleport/components/Layout';

import { Navigation } from 'teleport/Discover/Navigation/Navigation';
import { SelectResource } from 'teleport/Discover/SelectResource';
import { SelectResource } from 'teleport/Discover/SelectResource/SelectResource';
import cfg from 'teleport/config';

import { findViewAtIndex } from './flow';
Expand Down
10 changes: 8 additions & 2 deletions web/packages/teleport/src/components/EventRangePicker/Custom/Custom.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,17 @@ limitations under the License.
import React from 'react';
import { isAfter, endOfDay, startOfDay, isSameDay, subMonths } from 'date-fns';
import styled from 'styled-components';
import DayPicker, { DateUtils } from 'react-day-picker';
import dayPicker from 'react-day-picker/DayPicker';
import 'react-day-picker/lib/style.css';
import { Flex } from 'design';
import { Close as CloseIcon } from 'design/Icon';

// There is a vite issue with react-day-picker in production builds
// https://github.com/vitejs/vite/issues/2139
// TODO(ryan): After node v18 upgrade, swap to the Vite config approach instead of this one
// also, we should look into upgrading react-day-picker
const DayPicker = dayPicker.default || dayPicker;

export default class CustomRange extends React.Component {
constructor(props) {
super();
Expand Down Expand Up @@ -51,7 +57,7 @@ export default class CustomRange extends React.Component {
this.startSelecting = true;
}

const range = DateUtils.addDayToRange(day, { from, end });
const range = dayPicker.DateUtils.addDayToRange(day, { from, end });

if (range.from) {
range.from = startOfDay(range.from);
Expand Down