fix(compiler-cli): generate proper exports.* identifiers in cjs output #22564
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
alxhub
added
action: merge
chuckjaz
approved these changes
Mar 2, 2018
| prefixIdent ? ts.createPropertyAccess(prefixIdent, name !) : ts.createIdentifier(name !); | ||
| return result; | ||
| if (prefixIdent) { | ||
| return ts.createPropertyAccess(prefixIdent, name !); |
| @@ -166,6 +173,19 @@ class _NodeEmitterVisitor implements StatementVisitor, ExpressionVisitor { | |||
| private _importsWithPrefixes = new Map<string, string>(); | |||
| private _reexports = new Map<string, {name: string, as: string}[]>(); | |||
| private _templateSources = new Map<ParseSourceFile, ts.SourceMapSource>(); | |||
| private _exportedVariableIdentifiers = new Map<string, ts.Identifier>(); | |||
|
|
|||
| loadExportedVariableIdentifiers(sourceFile: ts.SourceFile): void { | |||
There was a problem hiding this comment.
Comment explaining why we only collect variable references and not classes.
|
You can preview ca6faa7 at https://pr22564-ca6faa7.ngbuilds.io/. |
alxhub
force-pushed
the
injectable-def-inject-import
branch
from
ca6faa7
to
226b872
Compare
|
You can preview 226b872 at https://pr22564-226b872.ngbuilds.io/. |
When the compiler generates a reference to an exported variable in the same file, it inserts a synthetic ts.Identifier node. In CommonJS output, this synthetic node would not be properly rewritten with an `exports.` prefix. This change sets the TS original node property on the synthetic node we generate, which ensures TS knows to rewrite it in CommonJS output.
alxhub
force-pushed
the
injectable-def-inject-import
branch
from
226b872
to
c04e89b
Compare
|
You can preview c04e89b at https://pr22564-c04e89b.ngbuilds.io/. |
leo6104
pushed a commit
to leo6104/angular
that referenced
this pull request
Mar 25, 2018
angular#22564) When the compiler generates a reference to an exported variable in the same file, it inserts a synthetic ts.Identifier node. In CommonJS output, this synthetic node would not be properly rewritten with an `exports.` prefix. This change sets the TS original node property on the synthetic node we generate, which ensures TS knows to rewrite it in CommonJS output. PR Close angular#22564
|
This issue has been automatically locked due to inactivity. Read more about our automatic conversation locking policy. This action has been performed automatically by a bot. |
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.
When the compiler generates a reference to an exported variable in the
same file, it inserts a synthetic ts.Identifier node. In CommonJS
output, this synthetic node would not be properly rewritten with an
exports.prefix.This change sets the TS original node property on the synthetic node
we generate, which ensures TS knows to rewrite it in CommonJS output.