Skip to content

Commit 9f43cbe

Browse files
author
Kalle Ott
committed
fix: improve compiler settings for esm module
don't include tslib helpers for language features available when es modules are supported
1 parent c5e595d commit 9f43cbe

File tree

3 files changed

+109
-34
lines changed

3 files changed

+109
-34
lines changed

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react-lazy-svg",
3-
"version": "2.0.0",
3+
"version": "2.0.1",
44
"license": "MIT",
55
"repository": {
66
"url": "https://github.com/kaoDev/react-lazy-svg"
@@ -46,7 +46,6 @@
4646
"@babel/preset-typescript": "^7.13.0",
4747
"@rollup/plugin-babel": "^5.3.0",
4848
"@rollup/plugin-multi-entry": "^4.0.0",
49-
"@rollup/plugin-typescript": "^8.2.0",
5049
"@testing-library/jest-dom": "^5.11.9",
5150
"@testing-library/react": "^11.2.5",
5251
"@types/jest": "^26.0.20",
@@ -65,6 +64,7 @@
6564
"react-dom": "^17.0.1",
6665
"rollup": "^2.40.0",
6766
"rollup-plugin-filesize": "^9.1.1",
67+
"rollup-plugin-typescript2": "^0.30.0",
6868
"ts-jest": "^26.5.3",
6969
"tslib": "^2.1.0",
7070
"typescript": "^4.2.3",

rollup.config.js

Lines changed: 43 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,68 @@
1-
import typescript from '@rollup/plugin-typescript';
1+
// @ts-check
2+
import typescript from 'rollup-plugin-typescript2';
23
import filesize from 'rollup-plugin-filesize';
34

4-
const plugins = [
5-
typescript({
6-
lib: ['es5', 'es6', 'dom'],
7-
target: 'es5',
8-
declaration: true,
9-
noEmitOnError: true,
10-
}),
11-
filesize(),
12-
];
13-
145
const indexCjs = {
156
input: 'src/index.tsx',
167
output: {
178
format: 'cjs',
189
file: 'dist/index.cjs.js',
1910
},
20-
plugins,
11+
plugins: [
12+
typescript({
13+
tsconfigOverride: {
14+
compilerOptions: {
15+
lib: ['es5', 'es6', 'dom'],
16+
target: 'es5',
17+
declaration: false,
18+
noEmitOnError: true,
19+
},
20+
},
21+
}),
22+
filesize(),
23+
],
2124
};
25+
2226
const indexEsm = {
2327
input: 'src/index.tsx',
2428
output: {
2529
format: 'esm',
2630
file: 'dist/index.esm.js',
2731
},
28-
plugins,
32+
plugins: [
33+
typescript({
34+
tsconfigOverride: {
35+
compilerOptions: {
36+
lib: ['es5', 'es6', 'dom'],
37+
target: 'es2019',
38+
declaration: true,
39+
noEmitOnError: true,
40+
},
41+
},
42+
}),
43+
filesize(),
44+
],
2945
};
46+
3047
const ssrCjs = {
3148
input: 'src/ssr.tsx',
3249
output: {
3350
format: 'cjs',
3451
file: 'dist/ssr.js',
3552
},
36-
plugins,
53+
plugins: [
54+
typescript({
55+
tsconfigOverride: {
56+
compilerOptions: {
57+
lib: ['es5', 'es6', 'dom'],
58+
target: 'es5',
59+
declaration: true,
60+
noEmitOnError: true,
61+
},
62+
},
63+
}),
64+
filesize(),
65+
],
3766
};
3867

3968
export default [indexCjs, indexEsm, ssrCjs];

yarn.lock

Lines changed: 64 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -694,14 +694,6 @@
694694
"@rollup/plugin-virtual" "^2.0.3"
695695
matched "^5.0.0"
696696

697-
"@rollup/plugin-typescript@^8.2.0":
698-
version "8.2.0"
699-
resolved "https://registry.yarnpkg.com/@rollup/plugin-typescript/-/plugin-typescript-8.2.0.tgz#3e2059cbcae916785d8d7bf07816210c829f817c"
700-
integrity sha512-5DyVsb7L+ehLfNPu/nat8Gq3uJGzku4bMFPt90XahtgiSBf7z9YKPLqFUJKMT41W/mJ98SVGDPOhzikGrr/Lhg==
701-
dependencies:
702-
"@rollup/pluginutils" "^3.1.0"
703-
resolve "^1.17.0"
704-
705697
"@rollup/plugin-virtual@^2.0.3":
706698
version "2.0.3"
707699
resolved "https://registry.yarnpkg.com/@rollup/plugin-virtual/-/plugin-virtual-2.0.3.tgz#0afc88d75c1e1378ab290b8e9898d4edb5be0d74"
@@ -716,6 +708,14 @@
716708
estree-walker "^1.0.1"
717709
picomatch "^2.2.2"
718710

711+
"@rollup/pluginutils@^4.1.0":
712+
version "4.1.0"
713+
resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-4.1.0.tgz#0dcc61c780e39257554feb7f77207dceca13c838"
714+
integrity sha512-TrBhfJkFxA+ER+ew2U2/fHbebhLT/l/2pRk0hfj9KusXUuRXd2v0R58AfaZK9VXDQ4TogOSEmICVrQAA3zFnHQ==
715+
dependencies:
716+
estree-walker "^2.0.1"
717+
picomatch "^2.2.2"
718+
719719
"@sinonjs/commons@^1.7.0":
720720
version "1.8.2"
721721
resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.2.tgz#858f5c4b48d80778fde4b9d541f27edc0d56488b"
@@ -1708,6 +1708,11 @@ commander@^2.20.0:
17081708
resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
17091709
integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
17101710

1711+
commondir@^1.0.1:
1712+
version "1.0.1"
1713+
resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
1714+
integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=
1715+
17111716
component-emitter@^1.2.1:
17121717
version "1.3.0"
17131718
resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0"
@@ -2264,6 +2269,11 @@ estree-walker@^1.0.1:
22642269
resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-1.0.1.tgz#31bc5d612c96b704106b477e6dd5d8aa138cb700"
22652270
integrity sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==
22662271

2272+
estree-walker@^2.0.1:
2273+
version "2.0.2"
2274+
resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-2.0.2.tgz#52f010178c2a4c117a7757cfe942adb7d2da4cac"
2275+
integrity sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==
2276+
22672277
esutils@^2.0.2:
22682278
version "2.0.3"
22692279
resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
@@ -2451,6 +2461,15 @@ fill-range@^7.0.1:
24512461
dependencies:
24522462
to-regex-range "^5.0.1"
24532463

2464+
find-cache-dir@^3.3.1:
2465+
version "3.3.1"
2466+
resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.1.tgz#89b33fad4a4670daa94f855f7fbe31d6d84fe880"
2467+
integrity sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ==
2468+
dependencies:
2469+
commondir "^1.0.1"
2470+
make-dir "^3.0.2"
2471+
pkg-dir "^4.1.0"
2472+
24542473
find-up@^4.0.0, find-up@^4.1.0:
24552474
version "4.1.0"
24562475
resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"
@@ -2498,6 +2517,15 @@ fragment-cache@^0.2.1:
24982517
dependencies:
24992518
map-cache "^0.2.2"
25002519

2520+
2521+
version "8.1.0"
2522+
resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"
2523+
integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==
2524+
dependencies:
2525+
graceful-fs "^4.2.0"
2526+
jsonfile "^4.0.0"
2527+
universalify "^0.1.0"
2528+
25012529
fs-minipass@^2.0.0, fs-minipass@^2.1.0:
25022530
version "2.1.0"
25032531
resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb"
@@ -2639,7 +2667,7 @@ globby@^11.0.1:
26392667
merge2 "^1.3.0"
26402668
slash "^3.0.0"
26412669

2642-
graceful-fs@^4.2.3, graceful-fs@^4.2.4:
2670+
graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.3, graceful-fs@^4.2.4:
26432671
version "4.2.6"
26442672
resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz#ff040b2b0853b23c3d31027523706f1885d76bee"
26452673
integrity sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==
@@ -3702,6 +3730,13 @@ json5@^2.1.2:
37023730
dependencies:
37033731
minimist "^1.2.5"
37043732

3733+
jsonfile@^4.0.0:
3734+
version "4.0.0"
3735+
resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
3736+
integrity sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=
3737+
optionalDependencies:
3738+
graceful-fs "^4.1.6"
3739+
37053740
jsonparse@^1.3.1:
37063741
version "1.3.1"
37073742
resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280"
@@ -3821,7 +3856,7 @@ lz-string@^1.4.4:
38213856
resolved "https://registry.yarnpkg.com/lz-string/-/lz-string-1.4.4.tgz#c0d8eaf36059f705796e1e344811cf4c498d3a26"
38223857
integrity sha1-wNjq82BZ9wV5bh40SBHPTEmNOiY=
38233858

3824-
make-dir@^3.0.0:
3859+
make-dir@^3.0.0, make-dir@^3.0.2:
38253860
version "3.1.0"
38263861
resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f"
38273862
integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==
@@ -4512,7 +4547,7 @@ pirates@^4.0.1:
45124547
dependencies:
45134548
node-modules-regexp "^1.0.0"
45144549

4515-
pkg-dir@^4.2.0:
4550+
pkg-dir@^4.1.0, pkg-dir@^4.2.0:
45164551
version "4.2.0"
45174552
resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3"
45184553
integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==
@@ -4842,7 +4877,7 @@ resolve-url@^0.2.1:
48424877
resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
48434878
integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
48444879

4845-
resolve@^1.10.0, resolve@^1.17.0, resolve@^1.18.1:
4880+
resolve@1.20.0, resolve@^1.10.0, resolve@^1.18.1:
48464881
version "1.20.0"
48474882
resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975"
48484883
integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==
@@ -4886,6 +4921,17 @@ rollup-plugin-filesize@^9.1.1:
48864921
pacote "^11.2.7"
48874922
terser "^5.6.0"
48884923

4924+
rollup-plugin-typescript2@^0.30.0:
4925+
version "0.30.0"
4926+
resolved "https://registry.yarnpkg.com/rollup-plugin-typescript2/-/rollup-plugin-typescript2-0.30.0.tgz#1cc99ac2309bf4b9d0a3ebdbc2002aecd56083d3"
4927+
integrity sha512-NUFszIQyhgDdhRS9ya/VEmsnpTe+GERDMmFo0Y+kf8ds51Xy57nPNGglJY+W6x1vcouA7Au7nsTgsLFj2I0PxQ==
4928+
dependencies:
4929+
"@rollup/pluginutils" "^4.1.0"
4930+
find-cache-dir "^3.3.1"
4931+
fs-extra "8.1.0"
4932+
resolve "1.20.0"
4933+
tslib "2.1.0"
4934+
48894935
rollup@^2.40.0:
48904936
version "2.40.0"
48914937
resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.40.0.tgz#efc218eaede7ab590954df50f96195188999c304"
@@ -5573,16 +5619,16 @@ ts-jest@^26.5.3:
55735619
semver "7.x"
55745620
yargs-parser "20.x"
55755621

5622+
[email protected], tslib@^2.1.0:
5623+
version "2.1.0"
5624+
resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.1.0.tgz#da60860f1c2ecaa5703ab7d39bc05b6bf988b97a"
5625+
integrity sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==
5626+
55765627
tslib@^1.8.1:
55775628
version "1.10.0"
55785629
resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz#c3c19f95973fb0a62973fb09d90d961ee43e5c8a"
55795630
integrity sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==
55805631

5581-
tslib@^2.1.0:
5582-
version "2.1.0"
5583-
resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.1.0.tgz#da60860f1c2ecaa5703ab7d39bc05b6bf988b97a"
5584-
integrity sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==
5585-
55865632
tsutils@^3.17.1:
55875633
version "3.17.1"
55885634
resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.17.1.tgz#ed719917f11ca0dee586272b2ac49e015a2dd759"
@@ -5687,7 +5733,7 @@ unique-slug@^2.0.0:
56875733
dependencies:
56885734
imurmurhash "^0.1.4"
56895735

5690-
universalify@^0.1.2:
5736+
universalify@^0.1.0, universalify@^0.1.2:
56915737
version "0.1.2"
56925738
resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
56935739
integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==

0 commit comments

Comments
 (0)