Skip to content

Commit 1ac5e3b

Browse files
committed
Default to ESM imports, use CJS imports in CJS builds
Closes #312
1 parent 53ad956 commit 1ac5e3b

File tree

3 files changed

+195
-7
lines changed

3 files changed

+195
-7
lines changed

package.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,11 @@
1919
},
2020
"scripts": {
2121
"build": "yarn build-js && yarn copy-styles",
22-
"build-js": "yarn build-js-esm && yarn build-js-cjs && yarn build-js-cjs-package",
22+
"build-js": "yarn build-js-esm && yarn build-js-cjs && yarn build-js-cjs-package && yarn build-js-cjs-replace",
2323
"build-js-esm": "tsc --project tsconfig.build.json --outDir dist/esm --module esnext",
2424
"build-js-cjs": "tsc --project tsconfig.build.json --outDir dist/cjs --module commonjs",
2525
"build-js-cjs-package": "echo '{\n \"type\": \"commonjs\"\n}' > dist/cjs/package.json",
26+
"build-js-cjs-replace": "replace-in-files --string='/dist/esm/' --replacement='/dist/cjs/' dist/cjs/**/*",
2627
"clean": "rimraf dist",
2728
"copy-styles": "cpy 'src/**/*.css' dist",
2829
"lint": "eslint . --ext .js,.jsx,.ts,.tsx",
@@ -73,6 +74,7 @@
7374
"pretty-quick": "^3.1.0",
7475
"react": "^18.2.0",
7576
"react-dom": "^18.2.0",
77+
"replace-in-files-cli": "^2.2.0",
7678
"rimraf": "^3.0.0",
7779
"typescript": "^5.0.0",
7880
"vitest": "^0.30.1",

src/DateRangePicker.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import clsx from 'clsx';
88
import Calendar from 'react-calendar';
99
import Fit from 'react-fit';
1010

11-
import DateInput from 'react-date-picker/dist/cjs/DateInput';
11+
import DateInput from 'react-date-picker/dist/esm/DateInput';
1212

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

yarn.lock

Lines changed: 191 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -562,7 +562,7 @@ __metadata:
562562
languageName: node
563563
linkType: hard
564564

565-
"@types/normalize-package-data@npm:^2.4.1":
565+
"@types/normalize-package-data@npm:^2.4.0, @types/normalize-package-data@npm:^2.4.1":
566566
version: 2.4.1
567567
resolution: "@types/normalize-package-data@npm:2.4.1"
568568
checksum: e87bccbf11f95035c89a132b52b79ce69a1e3652fe55962363063c9c0dae0fe2477ebc585e03a9652adc6f381d24ba5589cc5e51849df4ced3d3e004a7d40ed5
@@ -854,6 +854,7 @@ __metadata:
854854
react-date-picker: ^10.5.0
855855
react-dom: ^18.2.0
856856
react-fit: ^1.7.0
857+
replace-in-files-cli: ^2.2.0
857858
rimraf: ^3.0.0
858859
typescript: ^5.0.0
859860
vitest: ^0.30.1
@@ -1081,6 +1082,13 @@ __metadata:
10811082
languageName: node
10821083
linkType: hard
10831084

1085+
"array-union@npm:^3.0.1":
1086+
version: 3.0.1
1087+
resolution: "array-union@npm:3.0.1"
1088+
checksum: 47b29f88258e8f37ffb93ddaa327d4308edd950b52943c172b73558afdd3fa74cfd68816ba5aa4b894242cf281fa3c6d0362ae057e4a18bddbaedbe46ebe7112
1089+
languageName: node
1090+
linkType: hard
1091+
10841092
"array.prototype.flat@npm:^1.3.1":
10851093
version: 1.3.1
10861094
resolution: "array.prototype.flat@npm:1.3.1"
@@ -1307,6 +1315,18 @@ __metadata:
13071315
languageName: node
13081316
linkType: hard
13091317

1318+
"camelcase-keys@npm:^7.0.0":
1319+
version: 7.0.2
1320+
resolution: "camelcase-keys@npm:7.0.2"
1321+
dependencies:
1322+
camelcase: ^6.3.0
1323+
map-obj: ^4.1.0
1324+
quick-lru: ^5.1.1
1325+
type-fest: ^1.2.1
1326+
checksum: b5821cc48dd00e8398a30c5d6547f06837ab44de123f1b3a603d0a03399722b2fc67a485a7e47106eb02ef543c3b50c5ebaabc1242cde4b63a267c3258d2365b
1327+
languageName: node
1328+
linkType: hard
1329+
13101330
"camelcase-keys@npm:^8.0.2":
13111331
version: 8.0.2
13121332
resolution: "camelcase-keys@npm:8.0.2"
@@ -1319,6 +1339,13 @@ __metadata:
13191339
languageName: node
13201340
linkType: hard
13211341

1342+
"camelcase@npm:^6.3.0":
1343+
version: 6.3.0
1344+
resolution: "camelcase@npm:6.3.0"
1345+
checksum: 8c96818a9076434998511251dcb2761a94817ea17dbdc37f47ac080bd088fc62c7369429a19e2178b993497132c8cbcf5cc1f44ba963e76782ba469c0474938d
1346+
languageName: node
1347+
linkType: hard
1348+
13221349
"camelcase@npm:^7.0.0":
13231350
version: 7.0.1
13241351
resolution: "camelcase@npm:7.0.1"
@@ -1643,6 +1670,16 @@ __metadata:
16431670
languageName: node
16441671
linkType: hard
16451672

1673+
"decamelize-keys@npm:^1.1.0":
1674+
version: 1.1.1
1675+
resolution: "decamelize-keys@npm:1.1.1"
1676+
dependencies:
1677+
decamelize: ^1.1.0
1678+
map-obj: ^1.0.0
1679+
checksum: fc645fe20b7bda2680bbf9481a3477257a7f9304b1691036092b97ab04c0ab53e3bf9fcc2d2ae382536568e402ec41fb11e1d4c3836a9abe2d813dd9ef4311e0
1680+
languageName: node
1681+
linkType: hard
1682+
16461683
"decamelize-keys@npm:^2.0.1":
16471684
version: 2.0.1
16481685
resolution: "decamelize-keys@npm:2.0.1"
@@ -1655,6 +1692,20 @@ __metadata:
16551692
languageName: node
16561693
linkType: hard
16571694

1695+
"decamelize@npm:^1.1.0":
1696+
version: 1.2.0
1697+
resolution: "decamelize@npm:1.2.0"
1698+
checksum: ad8c51a7e7e0720c70ec2eeb1163b66da03e7616d7b98c9ef43cce2416395e84c1e9548dd94f5f6ffecfee9f8b94251fc57121a8b021f2ff2469b2bae247b8aa
1699+
languageName: node
1700+
linkType: hard
1701+
1702+
"decamelize@npm:^5.0.0":
1703+
version: 5.0.1
1704+
resolution: "decamelize@npm:5.0.1"
1705+
checksum: 7c3b1ed4b3e60e7fbc00a35fb248298527c1cdfe603e41dfcf05e6c4a8cb9efbee60630deb677ed428908fb4e74e322966c687a094d1478ddc9c3a74e9dc7140
1706+
languageName: node
1707+
linkType: hard
1708+
16581709
"decamelize@npm:^6.0.0":
16591710
version: 6.0.0
16601711
resolution: "decamelize@npm:6.0.0"
@@ -2066,7 +2117,7 @@ __metadata:
20662117
languageName: node
20672118
linkType: hard
20682119

2069-
"escape-string-regexp@npm:5.0.0":
2120+
"escape-string-regexp@npm:5.0.0, escape-string-regexp@npm:^5.0.0":
20702121
version: 5.0.0
20712122
resolution: "escape-string-regexp@npm:5.0.0"
20722123
checksum: 20daabe197f3cb198ec28546deebcf24b3dbb1a5a269184381b3116d12f0532e06007f4bc8da25669d6a7f8efb68db0758df4cd981f57bc5b57f521a3e12c59e
@@ -2471,7 +2522,7 @@ __metadata:
24712522
languageName: node
24722523
linkType: hard
24732524

2474-
"fast-glob@npm:^3.2.12, fast-glob@npm:^3.2.9, fast-glob@npm:^3.3.0":
2525+
"fast-glob@npm:^3.2.12, fast-glob@npm:^3.2.7, fast-glob@npm:^3.2.9, fast-glob@npm:^3.3.0":
24752526
version: 3.3.1
24762527
resolution: "fast-glob@npm:3.3.1"
24772528
dependencies:
@@ -2809,6 +2860,20 @@ __metadata:
28092860
languageName: node
28102861
linkType: hard
28112862

2863+
"globby@npm:^12.0.2":
2864+
version: 12.2.0
2865+
resolution: "globby@npm:12.2.0"
2866+
dependencies:
2867+
array-union: ^3.0.1
2868+
dir-glob: ^3.0.1
2869+
fast-glob: ^3.2.7
2870+
ignore: ^5.1.9
2871+
merge2: ^1.4.1
2872+
slash: ^4.0.0
2873+
checksum: 2539379a7fff3473d3e7c68b4540ba38f36970f43f760e36e301515d5cb98a0c5736554957d90390906bee632327beb2f9518d1acd6911f61e436db11b0da5b5
2874+
languageName: node
2875+
linkType: hard
2876+
28122877
"globby@npm:^13.1.3, globby@npm:^13.1.4":
28132878
version: 13.2.2
28142879
resolution: "globby@npm:13.2.2"
@@ -3038,7 +3103,7 @@ __metadata:
30383103
languageName: node
30393104
linkType: hard
30403105

3041-
"ignore@npm:^5.1.4, ignore@npm:^5.2.0, ignore@npm:^5.2.4":
3106+
"ignore@npm:^5.1.4, ignore@npm:^5.1.9, ignore@npm:^5.2.0, ignore@npm:^5.2.4":
30423107
version: 5.2.4
30433108
resolution: "ignore@npm:5.2.4"
30443109
checksum: 3d4c309c6006e2621659311783eaea7ebcd41fe4ca1d78c91c473157ad6666a57a2df790fe0d07a12300d9aac2888204d7be8d59f9aaf665b1c7fcdb432517ef
@@ -3380,6 +3445,13 @@ __metadata:
33803445
languageName: node
33813446
linkType: hard
33823447

3448+
"is-typedarray@npm:^1.0.0":
3449+
version: 1.0.0
3450+
resolution: "is-typedarray@npm:1.0.0"
3451+
checksum: 3508c6cd0a9ee2e0df2fa2e9baabcdc89e911c7bd5cf64604586697212feec525aa21050e48affb5ffc3df20f0f5d2e2cf79b08caa64e1ccc9578e251763aef7
3452+
languageName: node
3453+
linkType: hard
3454+
33833455
"is-weakmap@npm:^2.0.1":
33843456
version: 2.0.1
33853457
resolution: "is-weakmap@npm:2.0.1"
@@ -3808,7 +3880,14 @@ __metadata:
38083880
languageName: node
38093881
linkType: hard
38103882

3811-
"map-obj@npm:^4.3.0":
3883+
"map-obj@npm:^1.0.0":
3884+
version: 1.0.1
3885+
resolution: "map-obj@npm:1.0.1"
3886+
checksum: 9949e7baec2a336e63b8d4dc71018c117c3ce6e39d2451ccbfd3b8350c547c4f6af331a4cbe1c83193d7c6b786082b6256bde843db90cb7da2a21e8fcc28afed
3887+
languageName: node
3888+
linkType: hard
3889+
3890+
"map-obj@npm:^4.1.0, map-obj@npm:^4.3.0":
38123891
version: 4.3.0
38133892
resolution: "map-obj@npm:4.3.0"
38143893
checksum: fbc554934d1a27a1910e842bc87b177b1a556609dd803747c85ece420692380827c6ae94a95cce4407c054fa0964be3bf8226f7f2cb2e9eeee432c7c1985684e
@@ -3824,6 +3903,26 @@ __metadata:
38243903
languageName: node
38253904
linkType: hard
38263905

3906+
"meow@npm:^10.1.1":
3907+
version: 10.1.5
3908+
resolution: "meow@npm:10.1.5"
3909+
dependencies:
3910+
"@types/minimist": ^1.2.2
3911+
camelcase-keys: ^7.0.0
3912+
decamelize: ^5.0.0
3913+
decamelize-keys: ^1.1.0
3914+
hard-rejection: ^2.1.0
3915+
minimist-options: 4.1.0
3916+
normalize-package-data: ^3.0.2
3917+
read-pkg-up: ^8.0.0
3918+
redent: ^4.0.0
3919+
trim-newlines: ^4.0.2
3920+
type-fest: ^1.2.2
3921+
yargs-parser: ^20.2.9
3922+
checksum: dd5f0caa4af18517813547dc66741dcbf52c4c23def5062578d39b11189fd9457aee5c1f2263a5cd6592a465023df8357e8ac876b685b64dbcf545e3f66c23a7
3923+
languageName: node
3924+
linkType: hard
3925+
38273926
"meow@npm:^12.0.1":
38283927
version: 12.0.1
38293928
resolution: "meow@npm:12.0.1"
@@ -4757,6 +4856,13 @@ __metadata:
47574856
languageName: node
47584857
linkType: hard
47594858

4859+
"quick-lru@npm:^5.1.1":
4860+
version: 5.1.1
4861+
resolution: "quick-lru@npm:5.1.1"
4862+
checksum: a516faa25574be7947969883e6068dbe4aa19e8ef8e8e0fd96cddd6d36485e9106d85c0041a27153286b0770b381328f4072aa40d3b18a19f5f7d2b78b94b5ed
4863+
languageName: node
4864+
linkType: hard
4865+
47604866
"quick-lru@npm:^6.1.1":
47614867
version: 6.1.1
47624868
resolution: "quick-lru@npm:6.1.1"
@@ -4870,6 +4976,17 @@ __metadata:
48704976
languageName: node
48714977
linkType: hard
48724978

4979+
"read-pkg-up@npm:^8.0.0":
4980+
version: 8.0.0
4981+
resolution: "read-pkg-up@npm:8.0.0"
4982+
dependencies:
4983+
find-up: ^5.0.0
4984+
read-pkg: ^6.0.0
4985+
type-fest: ^1.0.1
4986+
checksum: fe4c80401656b40b408884457fffb5a8015c03b1018cfd8e48f8d82a5e9023e24963603aeb2755608d964593e046c15b34d29b07d35af9c7aa478be81805209c
4987+
languageName: node
4988+
linkType: hard
4989+
48734990
"read-pkg-up@npm:^9.1.0":
48744991
version: 9.1.0
48754992
resolution: "read-pkg-up@npm:9.1.0"
@@ -4881,6 +4998,18 @@ __metadata:
48814998
languageName: node
48824999
linkType: hard
48835000

5001+
"read-pkg@npm:^6.0.0":
5002+
version: 6.0.0
5003+
resolution: "read-pkg@npm:6.0.0"
5004+
dependencies:
5005+
"@types/normalize-package-data": ^2.4.0
5006+
normalize-package-data: ^3.0.2
5007+
parse-json: ^5.2.0
5008+
type-fest: ^1.0.1
5009+
checksum: 0cebdff381128e923815c643074a87011070e5fc352bee575d327d6485da3317fab6d802a7b03deeb0be7be8d3ad1640397b3d5d2f044452caf4e8d1736bf94f
5010+
languageName: node
5011+
linkType: hard
5012+
48845013
"read-pkg@npm:^7.1.0":
48855014
version: 7.1.0
48865015
resolution: "read-pkg@npm:7.1.0"
@@ -4951,6 +5080,21 @@ __metadata:
49515080
languageName: node
49525081
linkType: hard
49535082

5083+
"replace-in-files-cli@npm:^2.2.0":
5084+
version: 2.2.0
5085+
resolution: "replace-in-files-cli@npm:2.2.0"
5086+
dependencies:
5087+
escape-string-regexp: ^5.0.0
5088+
globby: ^12.0.2
5089+
meow: ^10.1.1
5090+
normalize-path: ^3.0.0
5091+
write-file-atomic: ^3.0.3
5092+
bin:
5093+
replace-in-files: cli.js
5094+
checksum: 6c4b020c428257d8522bc1fbb91555600d158dd912c9471b4c36bec310ce894f3e819a28263efcca379c3b78e1a6d2101d4f78f27947ddbd5043092617d5393b
5095+
languageName: node
5096+
linkType: hard
5097+
49545098
"requires-port@npm:^1.0.0":
49555099
version: 1.0.0
49565100
resolution: "requires-port@npm:1.0.0"
@@ -5625,6 +5769,13 @@ __metadata:
56255769
languageName: node
56265770
linkType: hard
56275771

5772+
"trim-newlines@npm:^4.0.2":
5773+
version: 4.1.1
5774+
resolution: "trim-newlines@npm:4.1.1"
5775+
checksum: 5b09f8e329e8f33c1111ef26906332ba7ba7248cde3e26fc054bb3d69f2858bf5feedca9559c572ff91f33e52977c28e0d41c387df6a02a633cbb8c2d8238627
5776+
languageName: node
5777+
linkType: hard
5778+
56285779
"trim-newlines@npm:^5.0.0":
56295780
version: 5.0.0
56305781
resolution: "trim-newlines@npm:5.0.0"
@@ -5683,6 +5834,13 @@ __metadata:
56835834
languageName: node
56845835
linkType: hard
56855836

5837+
"type-fest@npm:^1.0.1, type-fest@npm:^1.2.1, type-fest@npm:^1.2.2":
5838+
version: 1.4.0
5839+
resolution: "type-fest@npm:1.4.0"
5840+
checksum: b011c3388665b097ae6a109a437a04d6f61d81b7357f74cbcb02246f2f5bd72b888ae33631b99871388122ba0a87f4ff1c94078e7119ff22c70e52c0ff828201
5841+
languageName: node
5842+
linkType: hard
5843+
56865844
"type-fest@npm:^2.0.0, type-fest@npm:^2.13.0, type-fest@npm:^2.5.0":
56875845
version: 2.19.0
56885846
resolution: "type-fest@npm:2.19.0"
@@ -5708,6 +5866,15 @@ __metadata:
57085866
languageName: node
57095867
linkType: hard
57105868

5869+
"typedarray-to-buffer@npm:^3.1.5":
5870+
version: 3.1.5
5871+
resolution: "typedarray-to-buffer@npm:3.1.5"
5872+
dependencies:
5873+
is-typedarray: ^1.0.0
5874+
checksum: 99c11aaa8f45189fcfba6b8a4825fd684a321caa9bd7a76a27cf0c7732c174d198b99f449c52c3818107430b5f41c0ccbbfb75cb2ee3ca4a9451710986d61a60
5875+
languageName: node
5876+
linkType: hard
5877+
57115878
"typescript@npm:^5.0.0":
57125879
version: 5.0.4
57135880
resolution: "typescript@npm:5.0.4"
@@ -6082,6 +6249,18 @@ __metadata:
60826249
languageName: node
60836250
linkType: hard
60846251

6252+
"write-file-atomic@npm:^3.0.3":
6253+
version: 3.0.3
6254+
resolution: "write-file-atomic@npm:3.0.3"
6255+
dependencies:
6256+
imurmurhash: ^0.1.4
6257+
is-typedarray: ^1.0.0
6258+
signal-exit: ^3.0.2
6259+
typedarray-to-buffer: ^3.1.5
6260+
checksum: c55b24617cc61c3a4379f425fc62a386cc51916a9b9d993f39734d005a09d5a4bb748bc251f1304e7abd71d0a26d339996c275955f527a131b1dcded67878280
6261+
languageName: node
6262+
linkType: hard
6263+
60856264
"ws@npm:^8.13.0":
60866265
version: 8.13.0
60876266
resolution: "ws@npm:8.13.0"
@@ -6118,6 +6297,13 @@ __metadata:
61186297
languageName: node
61196298
linkType: hard
61206299

6300+
"yargs-parser@npm:^20.2.9":
6301+
version: 20.2.9
6302+
resolution: "yargs-parser@npm:20.2.9"
6303+
checksum: 8bb69015f2b0ff9e17b2c8e6bfe224ab463dd00ca211eece72a4cd8a906224d2703fb8a326d36fdd0e68701e201b2a60ed7cf81ce0fd9b3799f9fe7745977ae3
6304+
languageName: node
6305+
linkType: hard
6306+
61216307
"yargs-parser@npm:^21.1.1":
61226308
version: 21.1.1
61236309
resolution: "yargs-parser@npm:21.1.1"

0 commit comments

Comments
 (0)