Skip to content

Commit

Permalink
Add native ESM support
Browse files Browse the repository at this point in the history
  • Loading branch information
wojtekmaj committed Jul 27, 2023
1 parent ba99842 commit 643e7b3
Show file tree
Hide file tree
Showing 18 changed files with 60 additions and 39 deletions.
25 changes: 19 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,31 @@
"name": "react-datetime-picker",
"version": "5.3.0",
"description": "A date range picker for your React app.",
"main": "dist/cjs/index.js",
"module": "dist/esm/index.js",
"source": "src/index.ts",
"types": "dist/cjs/index.d.ts",
"type": "module",
"sideEffects": [
"*.css"
],
"main": "./dist/cjs/index.js",
"module": "./dist/esm/index.js",
"source": "./src/index.ts",
"types": "./dist/cjs/index.d.ts",
"exports": {
".": {
"import": "./dist/esm/index.js",
"require": "./dist/cjs/index.js"
},
"./dist/cjs/DateTimeInput": "./dist/cjs/DateTimeInput.js",
"./dist/cjs/DateTimeInput.js": "./dist/cjs/DateTimeInput.js",
"./dist/esm/DateTimeInput": "./dist/esm/DateTimeInput.js",
"./dist/esm/DateTimeInput.js": "./dist/esm/DateTimeInput.js",
"./dist/DateTimePicker.css": "./dist/DateTimePicker.css"
},
"scripts": {
"build": "yarn build-js && yarn copy-styles",
"build-js": "yarn build-js-esm && yarn build-js-cjs",
"build-js": "yarn build-js-esm && yarn build-js-cjs && yarn build-js-cjs-package",
"build-js-esm": "tsc --project tsconfig.build.json --outDir dist/esm --module esnext",
"build-js-cjs": "tsc --project tsconfig.build.json --outDir dist/cjs --module commonjs",
"build-js-cjs-package": "echo '{\n \"type\": \"commonjs\"\n}' > dist/cjs/package.json",
"clean": "rimraf dist",
"copy-styles": "cpy 'src/**/*.css' dist",
"lint": "eslint . --ext .js,.jsx,.ts,.tsx",
Expand All @@ -23,7 +36,7 @@
"test": "yarn lint && yarn tsc && yarn prettier && yarn unit",
"tsc": "tsc --noEmit",
"unit": "vitest",
"watch": "yarn build-js-esm --watch & yarn build-js-cjs --watch & nodemon --watch src --ext css --exec \"yarn copy-styles\""
"watch": "yarn build-js-esm --watch & yarn build-js-cjs --watch & yarn build-js-cjs-package & nodemon --watch src --ext css --exec \"yarn copy-styles\""
},
"keywords": [
"calendar",
Expand Down
3 changes: 2 additions & 1 deletion sample/index.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import React from 'react';
import { createRoot } from 'react-dom/client';
import Sample from './Sample';

import Sample from './Sample.js';

createRoot(document.getElementById('react-root') as HTMLDivElement).render(<Sample />);
4 changes: 2 additions & 2 deletions src/DateTimeInput.spec.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ import React from 'react';
import { fireEvent, render } from '@testing-library/react';
import userEvent from '@testing-library/user-event';

import DateTimeInput from './DateTimeInput';
import DateTimeInput from './DateTimeInput.js';

import { muteConsole, restoreConsole } from '../test-utils';
import { muteConsole, restoreConsole } from '../test-utils.js';

vi.useFakeTimers();

Expand Down
12 changes: 6 additions & 6 deletions src/DateTimeInput.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {
getHoursMinutesSeconds,
} from '@wojtekmaj/date-utils';

import Divider from './Divider';
import Divider from './Divider.js';
import DayInput from 'react-date-picker/dist/cjs/DateInput/DayInput';
import MonthInput from 'react-date-picker/dist/cjs/DateInput/MonthInput';
import MonthSelect from 'react-date-picker/dist/cjs/DateInput/MonthSelect';
Expand All @@ -21,13 +21,13 @@ import Hour24Input from 'react-time-picker/dist/cjs/TimeInput/Hour24Input';
import MinuteInput from 'react-time-picker/dist/cjs/TimeInput/MinuteInput';
import SecondInput from 'react-time-picker/dist/cjs/TimeInput/SecondInput';
import AmPm from 'react-time-picker/dist/cjs/TimeInput/AmPm';
import NativeInput from './DateTimeInput/NativeInput';
import NativeInput from './DateTimeInput/NativeInput.js';

import { getFormatter, getNumberFormatter, formatDate } from './shared/dateFormatter';
import { convert12to24, convert24to12 } from './shared/dates';
import { between, getAmPmLabels } from './shared/utils';
import { getFormatter, getNumberFormatter, formatDate } from './shared/dateFormatter.js';
import { convert12to24, convert24to12 } from './shared/dates.js';
import { between, getAmPmLabels } from './shared/utils.js';

import type { AmPmType, Detail, LooseValuePiece } from './shared/types';
import type { AmPmType, Detail, LooseValuePiece } from './shared/types.js';

const getFormatterOptionsCache: Record<string, Intl.DateTimeFormatOptions> = {};

Expand Down
2 changes: 1 addition & 1 deletion src/DateTimeInput/NativeInput.spec.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { describe, expect, it } from 'vitest';
import React from 'react';
import { render } from '@testing-library/react';

import NativeInput from './NativeInput';
import NativeInput from './NativeInput.js';

describe('NativeInput', () => {
const defaultProps = {
Expand Down
2 changes: 1 addition & 1 deletion src/DateTimePicker.spec.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import React from 'react';
import { act, fireEvent, render, waitFor, waitForElementToBeRemoved } from '@testing-library/react';
import userEvent from '@testing-library/user-event';

import DateTimePicker from './DateTimePicker';
import DateTimePicker from './DateTimePicker.js';

async function waitForElementToBeRemovedOrHidden(callback: () => HTMLElement | null) {
const element = callback();
Expand Down
13 changes: 10 additions & 3 deletions src/DateTimePicker.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,19 @@ import Calendar from 'react-calendar';
import Clock from 'react-clock';
import Fit from 'react-fit';

import DateTimeInput from './DateTimeInput';
import DateTimeInput from './DateTimeInput.js';

import { isMaxDate, isMinDate, rangeOf } from './shared/propTypes';
import { isMaxDate, isMinDate, rangeOf } from './shared/propTypes.js';

import type { ReactNodeArray } from 'prop-types';
import type { ClassName, CloseReason, Detail, LooseValue, OpenReason, Value } from './shared/types';
import type {
ClassName,
CloseReason,
Detail,
LooseValue,
OpenReason,
Value,
} from './shared/types.js';

const baseClassName = 'react-datetime-picker';
const outsideActionEvents = ['mousedown', 'focusin', 'touchstart'] as const;
Expand Down
4 changes: 2 additions & 2 deletions src/index.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import DateTimePicker from './DateTimePicker';
import DateTimePicker from './DateTimePicker.js';

export type { DateTimePickerProps } from './DateTimePicker';
export type { DateTimePickerProps } from './DateTimePicker.js';

export { DateTimePicker };

Expand Down
2 changes: 1 addition & 1 deletion src/shared/dateFormatter.spec.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { describe, expect, it } from 'vitest';
import { formatDate } from './dateFormatter';
import { formatDate } from './dateFormatter.js';

describe('formatDate', () => {
it('returns proper full numeric date', () => {
Expand Down
2 changes: 1 addition & 1 deletion src/shared/dates.spec.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { describe, expect, it } from 'vitest';
import { convert12to24, convert24to12 } from './dates';
import { convert12to24, convert24to12 } from './dates.js';

describe('convert12to24', () => {
it.each`
Expand Down
2 changes: 1 addition & 1 deletion src/shared/dates.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { AmPmType } from './types';
import type { AmPmType } from './types.js';

export function convert12to24(hour12: string | number, amPm: AmPmType): number {
let hour24 = Number(hour12);
Expand Down
2 changes: 1 addition & 1 deletion src/shared/propTypes.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import PropTypes from 'prop-types';

import type { Requireable, Validator } from 'prop-types';
import type { Range } from './types';
import type { Range } from './types.js';

const allViews = ['hour', 'minute', 'second'];
const allValueTypes = [...allViews];
Expand Down
2 changes: 1 addition & 1 deletion src/shared/utils.spec.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { describe, expect, it } from 'vitest';
import { between } from './utils';
import { between } from './utils.js';

describe('between', () => {
it('returns value when value is within set boundaries', () => {
Expand Down
2 changes: 1 addition & 1 deletion src/shared/utils.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { getFormatter } from './dateFormatter';
import { getFormatter } from './dateFormatter.js';

/**
* Returns a value no smaller than min and no larger than max.
Expand Down
2 changes: 1 addition & 1 deletion test/MaxDetailOptions.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';

import type { Detail } from './shared/types';
import type { Detail } from './shared/types.js';

const allViews = ['hour', 'minute', 'second'] as const;

Expand Down
16 changes: 8 additions & 8 deletions test/Test.tsx
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
import React, { useRef, useState } from 'react';
import DateTimePicker from 'react-datetime-picker/src';
import 'react-datetime-picker/src/DateTimePicker.css';
import DateTimePicker from 'react-datetime-picker';
import 'react-datetime-picker/dist/DateTimePicker.css';
import 'react-calendar/dist/Calendar.css';
import 'react-clock/dist/Clock.css';

import ValidityOptions from './ValidityOptions';
import MaxDetailOptions from './MaxDetailOptions';
import LocaleOptions from './LocaleOptions';
import ValueOptions from './ValueOptions';
import ViewOptions from './ViewOptions';
import ValidityOptions from './ValidityOptions.js';
import MaxDetailOptions from './MaxDetailOptions.js';
import LocaleOptions from './LocaleOptions.js';
import ValueOptions from './ValueOptions.js';
import ViewOptions from './ViewOptions.js';

import './Test.css';

import { Detail, LooseValue } from './shared/types';
import { Detail, LooseValue } from './shared/types.js';

const now = new Date();

Expand Down
2 changes: 1 addition & 1 deletion test/ValueOptions.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react';
import { getISOLocalDateTime } from '@wojtekmaj/date-utils';

import type { LooseValue } from './shared/types';
import type { LooseValue } from './shared/types.js';

type ValueOptionsProps = {
setValue: (value: LooseValue) => void;
Expand Down
2 changes: 1 addition & 1 deletion test/index.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, { StrictMode } from 'react';
import { createRoot } from 'react-dom/client';

import Test from './Test';
import Test from './Test.js';

createRoot(document.getElementById('react-root') as HTMLDivElement).render(
<StrictMode>
Expand Down

0 comments on commit 643e7b3

Please sign in to comment.