-
Notifications
You must be signed in to change notification settings - Fork 6.8k
build: fix release output containing invalid imports sometimes #20201
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
mmalerba
merged 1 commit into
angular:master
from
devversion:build/fix-npm-release-output-broken-imports
Aug 5, 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
64 changes: 64 additions & 0 deletions
64
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,64 @@ | ||
diff --git node_modules/@bazel/typescript/internal/tsc_wrapped/compiler_host.js node_modules/@bazel/typescript/internal/tsc_wrapped/compiler_host.js | ||
index 031d9dad1..b9df57eb4 100644 | ||
--- node_modules/@bazel/typescript/internal/tsc_wrapped/compiler_host.js | ||
+++ node_modules/@bazel/typescript/internal/tsc_wrapped/compiler_host.js | ||
@@ -38,6 +38,44 @@ function validateBazelOptions(bazelOpts) { | ||
} | ||
} | ||
const SOURCE_EXT = /((\.d)?\.tsx?|\.js)$/; | ||
+ | ||
+/** Name of the TypeScript source file property containing the module name. */ | ||
+const MODULE_NAME_PROP = 'moduleName'; | ||
+ | ||
+/** | ||
+ * Updates the given source file with a specified module name at constant time. The module name | ||
+ * is not directly assigned to the source file object, but exposed through a proxy handler that | ||
+ * wraps the source file. This ensures that changing the `moduleName` does not affect the original | ||
+ * source file which originates from a cache and should not be invalidated. | ||
+ */ | ||
+function wrapSourceFileWithModuleName(sourceFile, moduleName) { | ||
+ return new Proxy(sourceFile, { | ||
+ has: (target, prop) => prop === MODULE_NAME_PROP || Reflect.has(target, prop), | ||
+ ownKeys: (target) => Reflect.ownKeys(target).concat(MODULE_NAME_PROP), | ||
+ getOwnPropertyDescriptor: (target, prop) => { | ||
+ if (prop === MODULE_NAME_PROP) { | ||
+ // TypeScript sometimes will enumerate through top-level properties of | ||
+ // a source file (e.g. to create a mutable clone). The module name should | ||
+ // not be skipped by accident here. | ||
+ return {configurable: true, enumerable: true}; | ||
+ } | ||
+ return Reflect.getOwnPropertyDescriptor(target, prop); | ||
+ }, | ||
+ get: function(target, prop, receiver) { | ||
+ if (prop === MODULE_NAME_PROP) { | ||
+ return moduleName; | ||
+ } | ||
+ return Reflect.get(target, prop, receiver); | ||
+ }, | ||
+ set: function(target, prop, value, receiver) { | ||
+ if (prop === MODULE_NAME_PROP) { | ||
+ return false; | ||
+ } | ||
+ return Reflect.set(target, prop, value, receiver); | ||
+ }, | ||
+ }) | ||
+} | ||
+ | ||
/** | ||
* CompilerHost that knows how to cache parsed files to improve compile times. | ||
*/ | ||
@@ -377,9 +415,11 @@ 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 | ||
- sf.moduleName = moduleName; | ||
+ // Setting the moduleName is equivalent to the original source having the triple | ||
+ // slash `///<amd-module name="some/name"/>` directive. Also note that we do not | ||
+ // directly modify the source file `moduleName` property as that means that | ||
+ // consecutive compilations using a cache could have an unexpected module name. | ||
+ return wrapSourceFileWithModuleName(sf, moduleName); | ||
} | ||
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.