Skip to content

Commit d1a6eea

Browse files
pi0egoist
authored andcommittedMay 8, 2019
fix: use mainFields (#186)
* fix: use `mainFields` * jsnext:main * tweak order * update rollup-plugin-node-resolve
1 parent 8643a1a commit d1a6eea

File tree

3 files changed

+19
-10
lines changed

3 files changed

+19
-10
lines changed
 

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
"rollup-plugin-commonjs": "^9.2.0",
4747
"rollup-plugin-hashbang": "^2.2.2",
4848
"rollup-plugin-json": "^3.1.0",
49-
"rollup-plugin-node-resolve": "^4.0.1",
49+
"rollup-plugin-node-resolve": "^4.2.3",
5050
"rollup-plugin-postcss": "^2.0.3",
5151
"rollup-plugin-replace": "^2.1.0",
5252
"rollup-plugin-terser": "^4.0.2"

‎src/plugins/node-resolve.ts

+6-3
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,12 @@ export default (options: Options) => {
1414
const plugin = require('rollup-plugin-node-resolve')({
1515
extensions: ['.js', '.json', '.jsx', '.ts', '.tsx'],
1616
preferBuiltins: true,
17-
jsnext: true,
18-
module: true,
19-
browser: options.browser
17+
mainFields: [
18+
options.browser && 'browser',
19+
'module',
20+
'jsnext:main',
21+
'main'
22+
].filter(Boolean)
2023
})
2124

2225
return {

‎yarn.lock

+12-6
Original file line numberDiff line numberDiff line change
@@ -947,7 +947,7 @@
947947
resolved "https://registry.npmjs.org/@types/resolve-from/-/resolve-from-4.0.0.tgz#55538ffe8e35c3116a4cebf814ce1a1f1d663fcc"
948948
integrity sha512-LjkxahYnTBr75YRCEI/FQnQVfP4fP69koNW+3bmSkZuiSCkXkTJpfl7SPcZ4biXfmZHduoVLElP4VWBhex+0zQ==
949949

950-
"@types/resolve@^0.0.8":
950+
"@types/resolve@0.0.8", "@types/resolve@^0.0.8":
951951
version "0.0.8"
952952
resolved "https://registry.npmjs.org/@types/resolve/-/resolve-0.0.8.tgz#f26074d238e02659e323ce1a13d041eee280e194"
953953
integrity sha512-auApPaJf3NPfe18hSoJkp8EbZzer2ISk7o8mCC3M9he/a04+gbMF97NkpD2S8riMGvm4BMRI59/SZQSaLTKpsQ==
@@ -1677,6 +1677,11 @@ builtin-modules@^3.0.0:
16771677
resolved "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.0.0.tgz#1e587d44b006620d90286cc7a9238bbc6129cab1"
16781678
integrity sha512-hMIeU4K2ilbXV6Uv93ZZ0Avg/M91RaKXucQ+4me2Do1txxBDyDZWCBa5bJSLqoNTRpXTLwEzIk1KmloenDDjhg==
16791679

1680+
builtin-modules@^3.1.0:
1681+
version "3.1.0"
1682+
resolved "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.1.0.tgz#aad97c15131eb76b65b50ef208e7584cd76a7484"
1683+
integrity sha512-k0KL0aWZuBt2lrxrcASWDfwOLMnodeQjodT/1SxEQAXsHANgo6ZC/VEaSEHCXt7aSTZ4/4H5LKa+tBXmW7Vtvw==
1684+
16801685
builtins@^1.0.3:
16811686
version "1.0.3"
16821687
resolved "https://registry.npmjs.org/builtins/-/builtins-1.0.3.tgz#cb94faeb61c8696451db36534e1422f94f0aee88"
@@ -7819,12 +7824,13 @@ rollup-plugin-json@^3.1.0:
78197824
dependencies:
78207825
rollup-pluginutils "^2.3.1"
78217826

7822-
rollup-plugin-node-resolve@^4.0.1:
7823-
version "4.0.1"
7824-
resolved "https://registry.npmjs.org/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-4.0.1.tgz#f95765d174e5daeef9ea6268566141f53aa9d422"
7825-
integrity sha512-fSS7YDuCe0gYqKsr5OvxMloeZYUSgN43Ypi1WeRZzQcWtHgFayV5tUSPYpxuaioIIWaBXl6NrVk0T2/sKwueLg==
7827+
rollup-plugin-node-resolve@^4.2.3:
7828+
version "4.2.3"
7829+
resolved "https://registry.npmjs.org/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-4.2.3.tgz#638a373a54287d19fcc088fdd1c6fd8a58e4d90a"
7830+
integrity sha512-r+WaesPzdGEynpLZLALFEDugA4ACa5zn7bc/+LVX4vAXQQ8IgDHv0xfsSvJ8tDXUtprfBtrDtRFg27ifKjcJTg==
78267831
dependencies:
7827-
builtin-modules "^3.0.0"
7832+
"@types/resolve" "0.0.8"
7833+
builtin-modules "^3.1.0"
78287834
is-module "^1.0.0"
78297835
resolve "^1.10.0"
78307836

0 commit comments

Comments
 (0)
Please sign in to comment.