-
Notifications
You must be signed in to change notification settings - Fork 2.6k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Process ESM .js modules in ./dist with Rollup, again. #6657
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
25c08a2
to
e8604b3
Compare
hwillson
approved these changes
Jul 21, 2020
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Great catch @benjamn!
This partially reverts commit 627bd1b. PR #6656 removed a function called `prepareESM`, which was no longer needed for the sake of running `rollup-plugin-invariant`, but which had another benefit: Rollup would replace imports/exports like // Example exports from ./dist/index.js: export * from './core' export * from './react' with their fully-expanded (and file-extensioned) equivalents: ... export { makeVar } from './cache/inmemory/reactiveVars.js'; export { defaultDataIdFromObject } from './cache/inmemory/policies.js'; export { InMemoryCache } from './cache/inmemory/inMemoryCache.js'; export { ApolloClient } from './core/ApolloClient.js'; ... Although this may look like more code, it's effectively what the bundler/browser will have to do anyway, and including the `.js` file extensions makes this code a little more browser- and Rollup-friendly (that is, you shouldn't have to use @rollup/plugin-node-resolve to bundle @apollo/client with Rollup). The expanded imports/exports are also closer to the ESM code shipped with @apollo/client@3.0.x, so restoring this behavior helps with the goal of keeping the changes in #6656 backwards-compatible for v3.1.0. Note that the CommonJS bundles used by Node.js are built before this step, so this expansion of imports does not affect Node.js.
e8604b3
to
1d57fc3
Compare
benjamn
added a commit
that referenced
this pull request
Jul 21, 2020
jimrandomh
pushed a commit
to jimrandomh/apollo-client
that referenced
this pull request
Jul 22, 2020
…6657) This partially reverts commit 627bd1b from PR apollographql#6656. PR apollographql#6656 removed a function called `prepareESM`, which was no longer needed for the sake of running `rollup-plugin-invariant`, but which had another benefit: Rollup would replace imports/exports like // Example exports from ./dist/index.js: export * from './core' export * from './react' with their fully-expanded (and file-extensioned) equivalents: ... export { makeVar } from './cache/inmemory/reactiveVars.js'; export { defaultDataIdFromObject } from './cache/inmemory/policies.js'; export { InMemoryCache } from './cache/inmemory/inMemoryCache.js'; export { ApolloClient } from './core/ApolloClient.js'; ... Although this may look like more code, it effectively saves the bundler/browser work by reducing indirection, and including the .js file extensions makes this code a little more browser- and Rollup-friendly (that is, you shouldn't have to use @rollup/plugin-node-resolve to bundle @apollo/client with Rollup). The expanded imports/exports are also closer to the ESM code shipped with @apollo/client@3.0.x, so restoring this behavior helps with the goal of keeping the changes in apollographql#6656 backwards-compatible for v3.1.0. Note that the CommonJS bundles used by Node.js are built before this step, so this expansion of imports does not affect Node.js.
jimrandomh
pushed a commit
to jimrandomh/apollo-client
that referenced
this pull request
Jul 22, 2020
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This partially reverts commit 627bd1b from PR #6656.
PR #6656 removed a function called
prepareESM
, which was no longer needed for the sake of runningrollup-plugin-invariant
, but which had another benefit: Rollup would replace imports/exports likewith their fully-expanded (and file-extensioned) equivalents:
Although this may look like more code, it effectively saves the bundler/browser work by reducing indirection, and including the
.js
file extensions makes this code a little more browser- and Rollup-friendly (that is, you shouldn't have to use@rollup/plugin-node-resolve
to bundle@apollo/client
with Rollup).The expanded imports/exports are also closer to the ESM code shipped with
@apollo/client@3.0.x
, so restoring this behavior helps with the goal of keeping the changes in #6656 backwards-compatible for v3.1.0.Note that the CommonJS bundles used by Node.js are built before this step, so this expansion of imports does not affect how Node.js consumes CommonJS.