Skip to content
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.

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

Add native ESM support #310

Merged
merged 1 commit into from
Jul 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
21 changes: 15 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,27 @@
"name": "@wojtekmaj/react-daterange-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/DateRangePicker.css": "./dist/DateRangePicker.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 +32,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 />);
2 changes: 1 addition & 1 deletion src/DateRangePicker.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 DateRangePicker from './DateRangePicker';
import DateRangePicker from './DateRangePicker.js';

async function waitForElementToBeRemovedOrHidden(callback: () => HTMLElement | null) {
const element = callback();
Expand Down
11 changes: 9 additions & 2 deletions src/DateRangePicker.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,17 @@ import Fit from 'react-fit';

import DateInput from 'react-date-picker/dist/cjs/DateInput';

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-daterange-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 DateRangePicker from './DateRangePicker';
import DateRangePicker from './DateRangePicker.js';

export type { DateRangePickerProps } from './DateRangePicker';
export type { DateRangePickerProps } from './DateRangePicker.js';

export { DateRangePicker };

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';

export const isMinDate: Validator<Date | null | undefined> = function isMinDate(
props,
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 = ['century', 'decade', 'year', 'month'] as const;

Expand Down
2 changes: 1 addition & 1 deletion test/MinDetailOptions.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 = ['century', 'decade', 'year', 'month'] as const;

Expand Down
18 changes: 9 additions & 9 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 DateRangePicker from '@wojtekmaj/react-daterange-picker/src';
import '@wojtekmaj/react-daterange-picker/src/DateRangePicker.css';
import DateRangePicker from '@wojtekmaj/react-daterange-picker';
import '@wojtekmaj/react-daterange-picker/dist/DateRangePicker.css';
import 'react-calendar/dist/Calendar.css';

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

import './Test.css';

import type { Detail, LooseValue } from './shared/types';
import type { 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 { getDayStart, getDayEnd, getISOLocalDate } 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