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
Make sure that Rollup's dynamicRequireTargets
are included
#12839
Merged
nicolo-ribaudo
merged 2 commits into
babel:main
from
nicolo-ribaudo:fix-standalone-unicode-properties-again
Feb 21, 2021
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
See packages/babel-standalone/src/dynamic-require-entrypoint.cjs for the reason for this diff. | ||
|
||
diff --git a/dist/index.js b/dist/index.js | ||
index 712f6a7d81b115d468a764b4139caa00d6cfc358..73fbf004217f3d44b6420d3082a0846b53e00f4c 100644 | ||
--- a/dist/index.js | ||
+++ b/dist/index.js | ||
@@ -1626,7 +1626,7 @@ function commonjs(options = {}) { | ||
const sourceMap = options.sourceMap !== false; | ||
|
||
function transformAndCheckExports(code, id) { | ||
- if (isDynamicRequireModulesEnabled && this.getModuleInfo(id).isEntry) { | ||
+ if (isDynamicRequireModulesEnabled && (this.getModuleInfo(id).isEntry || id.endsWith("/dynamic-require-entrypoint.cjs"))) { | ||
code = | ||
getDynamicPackagesEntryIntro(dynamicRequireModuleDirPaths, dynamicRequireModuleSet) + code; | ||
} |
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
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
13 changes: 13 additions & 0 deletions
13
packages/babel-standalone/src/dynamic-require-entrypoint.cjs
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
/* | ||
We bundle @babel/standalone using the dynamicRequireTargets option. | ||
This option needs to inject require() calls to all the modules that | ||
could be dynamically required later. | ||
|
||
By default it injects them in the entrypoint, but when rollup loads the | ||
entrypoint it finds syntax that it doesn't support (because | ||
@rollup/plugin-commonjs must run before @rollup/plugin-babel). | ||
|
||
We use "yarn patch" to modify the @rollup/plugin-commonjs package, so | ||
that it injects those "preload" require() calls in this file rather | ||
than in the entrypoint. | ||
*/ |
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
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
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.
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.
Without the explicit
.js
extension it was trying to parse the LICENSE file as JS.