-
Notifications
You must be signed in to change notification settings - Fork 6.8k
build: fix release output containing invalid imports sometimes #20214
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
Merged
andrewseguin
merged 1 commit into
angular:master
from
devversion:resubmit-npm-release-output-broken
Aug 12, 2020
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
34 changes: 34 additions & 0 deletions
34
tools/postinstall/@bazel_typescript_tsc_wrapped_worker_cache_fix.patch
This file contains hidden or 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,34 @@ | ||
diff --git node_modules/@bazel/typescript/internal/tsc_wrapped/compiler_host.js node_modules/@bazel/typescript/internal/tsc_wrapped/compiler_host.js | ||
index 031d9dad1..a7fe9b79b 100644 | ||
--- node_modules/@bazel/typescript/internal/tsc_wrapped/compiler_host.js | ||
+++ node_modules/@bazel/typescript/internal/tsc_wrapped/compiler_host.js | ||
@@ -377,10 +377,27 @@ class CompilerHost { | ||
`which would be overwritten with ${moduleName} ` + | ||
`by Bazel's TypeScript compiler.`); | ||
} | ||
- // Setting the moduleName is equivalent to the original source having a | ||
- // ///<amd-module name="some/name"/> directive | ||
+ | ||
+ // Setting the moduleName is equivalent to the original source having the triple | ||
+ // slash `///<amd-module name="some/name"/>` directive. Also note that we tag | ||
+ // source files for which we assigned a generated module name. This is necessary | ||
+ // so that we can reset the module name when the same source file is loaded from | ||
+ // a cache, but with a different module format where the auto-generated module | ||
+ // names are not desirable. The module name should not leak from previous | ||
+ // compilations through a potential source file cache. | ||
+ sf._hasGeneratedAmdModuleName = true; | ||
sf.moduleName = moduleName; | ||
+ return sf; | ||
} | ||
+ | ||
+ // If the loaded source file has a generated amd module name applied from | ||
+ // previous compilations (in worker mode), reset the file module name | ||
+ // as neither the UMD or AMD module format is used (for which we generate | ||
+ // the AMD module names automatically). | ||
+ if (sf._hasGeneratedAmdModuleName) { | ||
+ sf.moduleName = undefined; | ||
+ } | ||
+ | ||
return sf; | ||
}); | ||
} |
This file contains hidden or 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.
Uh oh!
There was an error while loading. Please reload this page.