diff --git a/internal/e2e/fine_grained_no_bin/BUILD.bazel b/internal/e2e/fine_grained_no_bin/BUILD.bazel index c6c51175ba..cedd46cbf6 100644 --- a/internal/e2e/fine_grained_no_bin/BUILD.bazel +++ b/internal/e2e/fine_grained_no_bin/BUILD.bazel @@ -9,7 +9,7 @@ nodejs_binary( name = "index", data = [ "index.js", - "@fine_grained_no_bin//rollup-plugin-node-resolve", + "@fine_grained_no_bin//fs.realpath", ], entry_point = "build_bazel_rules_nodejs/internal/e2e/fine_grained_no_bin/index.js", ) diff --git a/internal/e2e/fine_grained_no_bin/package.json b/internal/e2e/fine_grained_no_bin/package.json index 868228d71c..e341d0606a 100644 --- a/internal/e2e/fine_grained_no_bin/package.json +++ b/internal/e2e/fine_grained_no_bin/package.json @@ -1,5 +1,5 @@ { "dependencies": { - "rollup-plugin-node-resolve": "3.3.0" + "fs.realpath": "1.0.0" } } \ No newline at end of file diff --git a/internal/e2e/fine_grained_no_bin/yarn.lock b/internal/e2e/fine_grained_no_bin/yarn.lock index c462350002..1e7b709023 100644 --- a/internal/e2e/fine_grained_no_bin/yarn.lock +++ b/internal/e2e/fine_grained_no_bin/yarn.lock @@ -2,33 +2,7 @@ # yarn lockfile v1 -builtin-modules@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-2.0.0.tgz#60b7ef5ae6546bd7deefa74b08b62a43a232648e" - integrity sha512-3U5kUA5VPsRUA3nofm/BXX7GVHKfxz0hOBAPxXrIvHzlDRkQVqEn6yi8QJegxl4LzOHLdvb7XF5dVawa/VVYBg== - -is-module@^1.0.0: +fs.realpath@1.0.0: version "1.0.0" - resolved "https://registry.yarnpkg.com/is-module/-/is-module-1.0.0.tgz#3258fb69f78c14d5b815d664336b4cffb6441591" - integrity sha1-Mlj7afeMFNW4FdZkM2tM/7ZEFZE= - -path-parse@^1.0.5: - version "1.0.6" - resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c" - integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw== - -resolve@^1.1.6: - version "1.8.1" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.8.1.tgz#82f1ec19a423ac1fbd080b0bab06ba36e84a7a26" - integrity sha512-AicPrAC7Qu1JxPCZ9ZgCZlY35QgFnNqc+0LtbRNxnVw4TXvjQ72wnuL9JQcEBgXkI9JM8MsT9kaQoHcpCRJOYA== - dependencies: - path-parse "^1.0.5" - -rollup-plugin-node-resolve@3.3.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-3.3.0.tgz#c26d110a36812cbefa7ce117cadcd3439aa1c713" - integrity sha512-9zHGr3oUJq6G+X0oRMYlzid9fXicBdiydhwGChdyeNRGPcN/majtegApRKHLR5drboUvEWU+QeUmGTyEZQs3WA== - dependencies: - builtin-modules "^2.0.0" - is-module "^1.0.0" - resolve "^1.1.6" + resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" + integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= diff --git a/internal/rollup/package.json b/internal/rollup/package.json index 589409ff51..a41d694b44 100644 --- a/internal/rollup/package.json +++ b/internal/rollup/package.json @@ -4,7 +4,7 @@ "is-builtin-module": "2.0.0", "minimist": "1.2.0", "rollup": "1.0.0", - "rollup-plugin-node-resolve": "4.0.0", + "rollup-plugin-node-resolve": "gregmagolan/rollup-plugin-node-resolve#dist-4.0.0-ab35c968ca3803148ff21600402a8a5ff4be35af", "rollup-plugin-sourcemaps": "^0.4.2", "source-map-explorer": "^1.5.0", "tmp": "0.0.33", diff --git a/internal/rollup/rollup.config.js b/internal/rollup/rollup.config.js index 8a6896868a..787fad51b7 100644 --- a/internal/rollup/rollup.config.js +++ b/internal/rollup/rollup.config.js @@ -163,8 +163,16 @@ const config = { }, plugins: [TMPL_additional_plugins].concat([ {resolveId: resolveBazel}, - nodeResolve( - {jsnext: true, module: true, customResolveOptions: {moduleDirectory: nodeModulesRoot}}), + // Use custom rollup-plugin-node-resolve dist which supports + // the 'es2015' option for rollup to prioritize the 'es2015' entry point + // with fallback to 'module' and 'main'. + nodeResolve({ + es2015: true, + module: true, + jsnext: true, + main: true, + customResolveOptions: {moduleDirectory: nodeModulesRoot} + }), {resolveId: notResolved}, sourcemaps(), ]), diff --git a/internal/rollup/yarn.lock b/internal/rollup/yarn.lock index c7449df675..f4ee285c5c 100644 --- a/internal/rollup/yarn.lock +++ b/internal/rollup/yarn.lock @@ -420,9 +420,9 @@ resolve-url@^0.2.1: integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo= resolve@^1.8.1: - version "1.9.0" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.9.0.tgz#a14c6fdfa8f92a7df1d996cb7105fa744658ea06" - integrity sha512-TZNye00tI67lwYvzxCxHGjwTNlUV70io54/Ed4j6PscB8xVfuBJpRenI/o6dVk0cY0PYTY27AgCoGGxRnYuItQ== + version "1.10.0" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.10.0.tgz#3bdaaeaf45cc07f375656dfd2e54ed0810b101ba" + integrity sha512-3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg== dependencies: path-parse "^1.0.6" @@ -431,10 +431,9 @@ rimraf@~2.2.6: resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.2.8.tgz#e439be2aaee327321952730f99a8929e4fc50582" integrity sha1-5Dm+Kq7jJzIZUnMPmaiSnk/FBYI= -rollup-plugin-node-resolve@4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-4.0.0.tgz#9bc6b8205e9936cc0e26bba2415f1ecf1e64d9b2" - integrity sha512-7Ni+/M5RPSUBfUaP9alwYQiIKnKeXCOHiqBpKUl9kwp3jX5ZJtgXAait1cne6pGEVUUztPD6skIKH9Kq9sNtfw== +rollup-plugin-node-resolve@gregmagolan/rollup-plugin-node-resolve#dist-4.0.0-ab35c968ca3803148ff21600402a8a5ff4be35af: + version "4.0.0-ab35c968ca3803148ff21600402a8a5ff4be35af" + resolved "https://codeload.github.com/gregmagolan/rollup-plugin-node-resolve/tar.gz/9d4096e7467a3045ed36625aec313edb137f8c8f" dependencies: builtin-modules "^3.0.0" is-module "^1.0.0" diff --git a/internal/test/package.json b/internal/test/package.json index 19298ce9e6..b7e3557992 100644 --- a/internal/test/package.json +++ b/internal/test/package.json @@ -10,9 +10,9 @@ "node_resolve_main": "file:./node_resolve_main", "node_resolve_main_2": "file:./node_resolve_main_2", "node_resolve_nested_main": "file:./node_resolve_nested_main", - "rollup-plugin-node-resolve": "3.0.0", + "rollup-plugin-node-resolve": "gregmagolan/rollup-plugin-node-resolve#dist-4.0.0-ab35c968ca3803148ff21600402a8a5ff4be35af", "rollup-plugin-sourcemaps": "^0.4.2", - "rollup": "0.60.1", + "rollup": "1.0.0", "unidiff": "^0.0.4", "zone.js": "0.8.29" }, diff --git a/internal/test/yarn.lock b/internal/test/yarn.lock index c12d4e1ab6..4ff2b1ab29 100644 --- a/internal/test/yarn.lock +++ b/internal/test/yarn.lock @@ -10,6 +10,11 @@ version "10.3.2" resolved "https://registry.yarnpkg.com/@types/node/-/node-10.3.2.tgz#3840ec6c12556fdda6e0e6d036df853101d732a4" +acorn@^6.0.4: + version "6.1.0" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.1.0.tgz#b0a3be31752c97a0f7013c5f4903b71a05db6818" + integrity sha512-MW/FjM+IvU9CgBzjO3UIPCE2pyEwUsoFl+VGdczOPEdxfGFjuKny/gN54mOuX7Qxmb9Rg9MCn2oKiSUeW+pjrw== + arr-diff@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf" @@ -47,20 +52,15 @@ braces@^1.8.2: preserve "^0.2.0" repeat-element "^1.1.2" -browser-resolve@^1.11.0: - version "1.11.2" - resolved "https://registry.yarnpkg.com/browser-resolve/-/browser-resolve-1.11.2.tgz#8ff09b0a2c421718a1051c260b32e48f442938ce" - dependencies: - resolve "1.1.7" - -builtin-modules@^1.1.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f" - builtin-modules@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-2.0.0.tgz#60b7ef5ae6546bd7deefa74b08b62a43a232648e" +builtin-modules@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-3.0.0.tgz#1e587d44b006620d90286cc7a9238bbc6129cab1" + integrity sha512-hMIeU4K2ilbXV6Uv93ZZ0Avg/M91RaKXucQ+4me2Do1txxBDyDZWCBa5bJSLqoNTRpXTLwEzIk1KmloenDDjhg== + concat-map@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" @@ -199,6 +199,7 @@ is-glob@^2.0.0, is-glob@^2.0.1: is-module@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-module/-/is-module-1.0.0.tgz#3258fb69f78c14d5b815d664336b4cffb6441591" + integrity sha1-Mlj7afeMFNW4FdZkM2tM/7ZEFZE= is-number@^2.1.0: version "2.1.0" @@ -331,9 +332,10 @@ path-is-absolute@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" -path-parse@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.5.tgz#3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1" +path-parse@^1.0.6: + version "1.0.6" + resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c" + integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw== preserve@^0.2.0: version "0.2.0" @@ -368,24 +370,20 @@ resolve-url@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a" -resolve@1.1.7: - version "1.1.7" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b" - -resolve@^1.1.6: - version "1.5.0" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.5.0.tgz#1f09acce796c9a762579f31b2c1cc4c3cddf9f36" +resolve@^1.8.1: + version "1.10.0" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.10.0.tgz#3bdaaeaf45cc07f375656dfd2e54ed0810b101ba" + integrity sha512-3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg== dependencies: - path-parse "^1.0.5" + path-parse "^1.0.6" -rollup-plugin-node-resolve@3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-3.0.0.tgz#8b897c4c3030d5001277b0514b25d2ca09683ee0" +rollup-plugin-node-resolve@gregmagolan/rollup-plugin-node-resolve#dist-4.0.0-ab35c968ca3803148ff21600402a8a5ff4be35af: + version "4.0.0-ab35c968ca3803148ff21600402a8a5ff4be35af" + resolved "https://codeload.github.com/gregmagolan/rollup-plugin-node-resolve/tar.gz/9d4096e7467a3045ed36625aec313edb137f8c8f" dependencies: - browser-resolve "^1.11.0" - builtin-modules "^1.1.0" + builtin-modules "^3.0.0" is-module "^1.0.0" - resolve "^1.1.6" + resolve "^1.8.1" rollup-plugin-sourcemaps@^0.4.2: version "0.4.2" @@ -401,12 +399,14 @@ rollup-pluginutils@^2.0.1: estree-walker "^0.3.0" micromatch "^2.3.11" -rollup@0.60.1: - version "0.60.1" - resolved "https://registry.yarnpkg.com/rollup/-/rollup-0.60.1.tgz#07cb66153f1541d5f7e82b8393b405c31647dae9" +rollup@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/rollup/-/rollup-1.0.0.tgz#db97a04a15364d1cd3823a0024ae8d8fda530a1c" + integrity sha512-LV6Qz+RkuDAfxr9YopU4k5o5P/QA7YNq9xi2Ug2IqOmhPt9sAm89vh3SkNtFok3bqZHX54eMJZ8F68HPejgqtw== dependencies: "@types/estree" "0.0.39" "@types/node" "*" + acorn "^6.0.4" source-map-resolve@^0.5.0: version "0.5.1"