Skip to content

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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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;
});
}
5 changes: 4 additions & 1 deletion tools/postinstall/apply-patches.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const chalk = require('chalk');
* Version of the post install patch. Needs to be incremented when
* existing patches or edits have been modified.
*/
const PATCH_VERSION = 6;
const PATCH_VERSION = 9;

/** Path to the project directory. */
const projectDir = path.join(__dirname, '../..');
Expand Down Expand Up @@ -110,6 +110,9 @@ function applyPatches() {
// Workaround for: https://github.com/bazelbuild/rules_nodejs/issues/1208.
applyPatch(path.join(__dirname, './manifest_externs_hermeticity.patch'));

// Patches the changes from: https://github.com/bazelbuild/rules_typescript/pull/504.
applyPatch(path.join(__dirname, './@bazel_typescript_tsc_wrapped_worker_cache_fix.patch'));

// Workaround for https://github.com/angular/angular/issues/33452:
searchAndReplace(
/angular_compiler_options = {/, `$&
Expand Down