Skip to content

Commit 159306f

Browse files
committed
Default to ESM imports, use CJS imports in CJS builds
Closes #392
1 parent c25d271 commit 159306f

File tree

3 files changed

+203
-15
lines changed

3 files changed

+203
-15
lines changed

package.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,11 @@
3131
},
3232
"scripts": {
3333
"build": "yarn build-js && yarn copy-styles",
34-
"build-js": "yarn build-js-esm && yarn build-js-cjs && yarn build-js-cjs-package",
34+
"build-js": "yarn build-js-esm && yarn build-js-cjs && yarn build-js-cjs-package && yarn build-js-cjs-replace",
3535
"build-js-esm": "tsc --project tsconfig.build.json --outDir dist/esm --module esnext",
3636
"build-js-cjs": "tsc --project tsconfig.build.json --outDir dist/cjs --module commonjs",
3737
"build-js-cjs-package": "echo '{\n \"type\": \"commonjs\"\n}' > dist/cjs/package.json",
38+
"build-js-cjs-replace": "replace-in-files --string='/dist/esm/' --replacement='/dist/cjs/' dist/cjs/**/*",
3839
"clean": "rimraf dist",
3940
"copy-styles": "cpy 'src/**/*.css' dist",
4041
"lint": "eslint . --ext .js,.jsx,.ts,.tsx",
@@ -90,6 +91,7 @@
9091
"pretty-quick": "^3.1.0",
9192
"react": "^18.2.0",
9293
"react-dom": "^18.2.0",
94+
"replace-in-files-cli": "^2.2.0",
9395
"rimraf": "^3.0.0",
9496
"typescript": "^5.0.0",
9597
"vitest": "^0.30.1",

src/DateTimeInput.tsx

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ import {
1212
} from '@wojtekmaj/date-utils';
1313

1414
import Divider from './Divider.js';
15-
import DayInput from 'react-date-picker/dist/cjs/DateInput/DayInput';
16-
import MonthInput from 'react-date-picker/dist/cjs/DateInput/MonthInput';
17-
import MonthSelect from 'react-date-picker/dist/cjs/DateInput/MonthSelect';
18-
import YearInput from 'react-date-picker/dist/cjs/DateInput/YearInput';
19-
import Hour12Input from 'react-time-picker/dist/cjs/TimeInput/Hour12Input';
20-
import Hour24Input from 'react-time-picker/dist/cjs/TimeInput/Hour24Input';
21-
import MinuteInput from 'react-time-picker/dist/cjs/TimeInput/MinuteInput';
22-
import SecondInput from 'react-time-picker/dist/cjs/TimeInput/SecondInput';
23-
import AmPm from 'react-time-picker/dist/cjs/TimeInput/AmPm';
15+
import DayInput from 'react-date-picker/dist/esm/DateInput/DayInput';
16+
import MonthInput from 'react-date-picker/dist/esm/DateInput/MonthInput';
17+
import MonthSelect from 'react-date-picker/dist/esm/DateInput/MonthSelect';
18+
import YearInput from 'react-date-picker/dist/esm/DateInput/YearInput';
19+
import Hour12Input from 'react-time-picker/dist/esm/TimeInput/Hour12Input';
20+
import Hour24Input from 'react-time-picker/dist/esm/TimeInput/Hour24Input';
21+
import MinuteInput from 'react-time-picker/dist/esm/TimeInput/MinuteInput';
22+
import SecondInput from 'react-time-picker/dist/esm/TimeInput/SecondInput';
23+
import AmPm from 'react-time-picker/dist/esm/TimeInput/AmPm';
2424
import NativeInput from './DateTimeInput/NativeInput.js';
2525

2626
import { getFormatter, getNumberFormatter, formatDate } from './shared/dateFormatter.js';

0 commit comments

Comments
 (0)