Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Fix extensions for noDtsResolution in node16/nodenext #49233

Merged
merged 1 commit into from
May 25, 2022
Merged

Fix extensions for noDtsResolution in node16/nodenext #49233

merged 1 commit into from
May 25, 2022

Conversation

andrewbranch
Copy link
Member

@andrewbranch andrewbranch commented May 24, 2022 •
edited
Loading

Fixes 🙃 #49003 (comment)

@typescript-bot typescript-bot added Author: Team For Uncommitted Bug PR for untriaged, rejected, closed or missing bug labels May 24, 2022
@andrewbranch
Copy link
Member Author

@DanielRosenwasser can we put this into the next patch, whenever it goes out?

@DanielRosenwasser
Copy link
Member

Sure!

@DanielRosenwasser DanielRosenwasser added this to the TypeScript 4.7.3 milestone May 25, 2022
@DanielRosenwasser
Copy link
Member

@typescript-bot pack this
@typescript-bot test this
@typescript-bot user test this inline
@typescript-bot run dt
@typescript-bot perf test this

@typescript-bot
Copy link
Collaborator

typescript-bot commented May 25, 2022 •
edited
Loading

Heya @DanielRosenwasser, I've started to run the tarball bundle task on this PR at 1ab6396. You can monitor the build here.

@typescript-bot
Copy link
Collaborator

typescript-bot commented May 25, 2022 •
edited
Loading

Heya @DanielRosenwasser, I've started to run the perf test suite on this PR at 1ab6396. You can monitor the build here.

Update: The results are in!

@typescript-bot
Copy link
Collaborator

typescript-bot commented May 25, 2022 •
edited
Loading

Heya @DanielRosenwasser, I've started to run the extended test suite on this PR at 1ab6396. You can monitor the build here.

@typescript-bot
Copy link
Collaborator

typescript-bot commented May 25, 2022 •
edited
Loading

Heya @DanielRosenwasser, I've started to run the parallelized Definitely Typed test suite on this PR at 1ab6396. You can monitor the build here.

@typescript-bot
Copy link
Collaborator

typescript-bot commented May 25, 2022 •
edited
Loading

Heya @DanielRosenwasser, I've started to run the diff-based community code test suite on this PR at 1ab6396. You can monitor the build here.

Update: The results are in!

@typescript-bot
Copy link
Collaborator

@DanielRosenwasser
Great news! no new errors were found between main..refs/pull/49233/merge

@typescript-bot
Copy link
Collaborator

typescript-bot commented May 25, 2022 •
edited
Loading

Hey @DanielRosenwasser, I've packed this into an installable tgz. You can install it for testing by referencing it in your package.json like so:

{
    "devDependencies": {
        "typescript": "https://typescript.visualstudio.com/cf7ac146-d525-443c-b23c-0d58337efebc/_apis/build/builds/126793/artifacts?artifactName=tgz&fileId=F9A1F9485354F32790B9C0ACC1C53546BBB987CDE61B84E948D5B9D249F0F68A02&fileName=/typescript-4.8.0-insiders.20220525.tgz"
    }
}

and then running npm install.

There is also a playground for this build and an npm module you can use via "typescript": "npm:@typescript-deploys/pr-build@4.8.0-pr-49233-9".;

@typescript-bot
Copy link
Collaborator

@DanielRosenwasser
The results of the perf run you requested are in!

Here they are:

Comparison Report - main..49233

Metric main 49233 Delta Best Worst
Angular - node (v10.16.3, x64)
Memory used 357,694k (± 0.01%) 357,626k (± 0.02%) -68k (- 0.02%) 357,498k 357,866k
Parse Time 2.07s (± 0.56%) 2.07s (± 0.74%) -0.00s (- 0.05%) 2.03s 2.10s
Bind Time 0.86s (± 0.67%) 0.87s (± 0.51%) +0.01s (+ 0.58%) 0.86s 0.88s
Check Time 5.83s (± 0.56%) 5.84s (± 0.30%) +0.01s (+ 0.09%) 5.81s 5.88s
Emit Time 6.01s (± 0.42%) 6.04s (± 0.85%) +0.04s (+ 0.60%) 5.95s 6.20s
Total Time 14.77s (± 0.38%) 14.82s (± 0.46%) +0.05s (+ 0.31%) 14.69s 15.05s
Compiler-Unions - node (v10.16.3, x64)
Memory used 205,973k (± 0.03%) 206,016k (± 0.03%) +43k (+ 0.02%) 205,859k 206,221k
Parse Time 0.84s (± 1.03%) 0.83s (± 0.57%) -0.00s (- 0.60%) 0.82s 0.84s
Bind Time 0.52s (± 1.18%) 0.52s (± 1.44%) -0.00s (- 0.77%) 0.51s 0.54s
Check Time 7.90s (± 0.41%) 7.94s (± 0.49%) +0.05s (+ 0.61%) 7.86s 8.02s
Emit Time 2.51s (± 1.20%) 2.52s (± 1.09%) +0.01s (+ 0.56%) 2.47s 2.60s
Total Time 11.76s (± 0.44%) 11.81s (± 0.44%) +0.05s (+ 0.43%) 11.67s 11.88s
Monaco - node (v10.16.3, x64)
Memory used 343,821k (± 0.02%) 343,804k (± 0.03%) -18k (- 0.01%) 343,603k 343,960k
Parse Time 1.59s (± 0.65%) 1.59s (± 0.62%) +0.00s (+ 0.25%) 1.57s 1.61s
Bind Time 0.75s (± 0.48%) 0.76s (± 0.79%) +0.00s (+ 0.27%) 0.74s 0.77s
Check Time 5.81s (± 0.43%) 5.81s (± 0.51%) -0.00s (- 0.09%) 5.74s 5.88s
Emit Time 3.24s (± 0.76%) 3.24s (± 0.81%) +0.00s (+ 0.12%) 3.19s 3.32s
Total Time 11.40s (± 0.20%) 11.40s (± 0.30%) +0.00s (+ 0.03%) 11.33s 11.49s
TFS - node (v10.16.3, x64)
Memory used 305,526k (± 0.02%) 305,557k (± 0.02%) +32k (+ 0.01%) 305,462k 305,659k
Parse Time 1.30s (± 0.64%) 1.29s (± 0.65%) -0.01s (- 0.39%) 1.28s 1.32s
Bind Time 0.71s (± 1.05%) 0.72s (± 0.31%) +0.01s (+ 0.84%) 0.71s 0.72s
Check Time 5.26s (± 0.51%) 5.26s (± 0.50%) -0.00s (- 0.00%) 5.21s 5.31s
Emit Time 3.44s (± 1.60%) 3.40s (± 1.02%) -0.04s (- 1.08%) 3.35s 3.51s
Total Time 10.71s (± 0.54%) 10.67s (± 0.28%) -0.04s (- 0.38%) 10.62s 10.73s
material-ui - node (v10.16.3, x64)
Memory used 467,195k (± 0.01%) 467,181k (± 0.02%) -14k (- 0.00%) 466,989k 467,309k
Parse Time 1.83s (± 0.47%) 1.83s (± 0.89%) +0.00s (+ 0.27%) 1.81s 1.88s
Bind Time 0.67s (± 0.44%) 0.67s (± 1.12%) +0.00s (+ 0.30%) 0.65s 0.69s
Check Time 14.31s (± 0.79%) 14.30s (± 0.41%) -0.01s (- 0.06%) 14.16s 14.40s
Emit Time 0.00s (± 0.00%) 0.00s (± 0.00%) 0.00s ( NaN%) 0.00s 0.00s
Total Time 16.81s (± 0.67%) 16.81s (± 0.36%) -0.00s (- 0.01%) 16.66s 16.91s
xstate - node (v10.16.3, x64)
Memory used 571,744k (± 0.01%) 571,731k (± 0.02%) -13k (- 0.00%) 571,524k 571,971k
Parse Time 2.59s (± 0.55%) 2.58s (± 0.23%) -0.01s (- 0.23%) 2.57s 2.59s
Bind Time 1.01s (± 0.77%) 1.00s (± 0.81%) -0.01s (- 1.09%) 0.99s 1.02s
Check Time 1.53s (± 0.64%) 1.52s (± 0.49%) -0.00s (- 0.33%) 1.51s 1.54s
Emit Time 0.07s (± 3.14%) 0.07s (± 3.14%) 0.00s ( 0.00%) 0.07s 0.08s
Total Time 5.20s (± 0.42%) 5.18s (± 0.25%) -0.02s (- 0.35%) 5.16s 5.21s
Angular - node (v12.1.0, x64)
Memory used 335,373k (± 0.01%) 335,399k (± 0.02%) +27k (+ 0.01%) 335,255k 335,636k
Parse Time 2.07s (± 0.64%) 2.07s (± 1.24%) +0.00s (+ 0.24%) 2.03s 2.15s
Bind Time 0.82s (± 0.63%) 0.82s (± 0.49%) 0.00s ( 0.00%) 0.81s 0.83s
Check Time 5.62s (± 0.38%) 5.62s (± 0.43%) +0.00s (+ 0.02%) 5.58s 5.68s
Emit Time 6.23s (± 0.51%) 6.26s (± 1.16%) +0.03s (+ 0.48%) 6.18s 6.53s
Total Time 14.75s (± 0.34%) 14.78s (± 0.59%) +0.04s (+ 0.26%) 14.65s 15.06s
Compiler-Unions - node (v12.1.0, x64)
Memory used 193,418k (± 0.12%) 193,645k (± 0.03%) +227k (+ 0.12%) 193,523k 193,764k
Parse Time 0.83s (± 1.29%) 0.83s (± 0.96%) +0.00s (+ 0.12%) 0.82s 0.85s
Bind Time 0.53s (± 0.71%) 0.53s (± 0.89%) +0.01s (+ 0.95%) 0.52s 0.54s
Check Time 7.42s (± 0.85%) 7.44s (± 0.65%) +0.02s (+ 0.30%) 7.34s 7.58s
Emit Time 2.52s (± 1.21%) 2.53s (± 0.77%) +0.01s (+ 0.48%) 2.48s 2.57s
Total Time 11.30s (± 0.68%) 11.34s (± 0.42%) +0.04s (+ 0.35%) 11.24s 11.47s
Monaco - node (v12.1.0, x64)
Memory used 326,898k (± 0.01%) 326,920k (± 0.02%) +23k (+ 0.01%) 326,782k 327,089k
Parse Time 1.55s (± 0.84%) 1.55s (± 0.43%) +0.00s (+ 0.06%) 1.53s 1.56s
Bind Time 0.74s (± 0.70%) 0.74s (± 0.54%) +0.00s (+ 0.27%) 0.73s 0.75s
Check Time 5.66s (± 0.57%) 5.64s (± 0.51%) -0.02s (- 0.35%) 5.59s 5.72s
Emit Time 3.27s (± 0.57%) 3.28s (± 0.70%) +0.00s (+ 0.06%) 3.24s 3.35s
Total Time 11.22s (± 0.32%) 11.21s (± 0.45%) -0.01s (- 0.12%) 11.12s 11.38s
TFS - node (v12.1.0, x64)
Memory used 290,174k (± 0.02%) 290,197k (± 0.02%) +23k (+ 0.01%) 290,069k 290,331k
Parse Time 1.31s (± 0.96%) 1.30s (± 0.96%) -0.00s (- 0.15%) 1.27s 1.34s
Bind Time 0.73s (± 1.00%) 0.73s (± 1.09%) +0.00s (+ 0.55%) 0.72s 0.75s
Check Time 5.21s (± 0.32%) 5.22s (± 0.52%) +0.01s (+ 0.15%) 5.17s 5.28s
Emit Time 3.50s (± 0.60%) 3.50s (± 0.78%) -0.00s (- 0.00%) 3.44s 3.58s
Total Time 10.75s (± 0.32%) 10.76s (± 0.37%) +0.01s (+ 0.09%) 10.70s 10.85s
material-ui - node (v12.1.0, x64)
Memory used 446,185k (± 0.02%) 446,140k (± 0.01%) -45k (- 0.01%) 446,028k 446,292k
Parse Time 1.83s (± 0.54%) 1.82s (± 0.52%) -0.01s (- 0.66%) 1.80s 1.84s
Bind Time 0.65s (± 0.80%) 0.65s (± 0.46%) +0.00s (+ 0.15%) 0.65s 0.66s
Check Time 12.91s (± 0.32%) 12.90s (± 0.48%) -0.01s (- 0.08%) 12.77s 13.07s
Emit Time 0.00s (± 0.00%) 0.00s (± 0.00%) 0.00s ( NaN%) 0.00s 0.00s
Total Time 15.39s (± 0.28%) 15.37s (± 0.46%) -0.02s (- 0.12%) 15.23s 15.55s
xstate - node (v12.1.0, x64)
Memory used 537,520k (± 0.01%) 540,667k (± 1.37%) +3,147k (+ 0.59%) 537,108k 570,506k
Parse Time 2.53s (± 0.38%) 2.52s (± 0.62%) -0.00s (- 0.08%) 2.49s 2.56s
Bind Time 1.02s (± 1.05%) 1.02s (± 0.69%) +0.00s (+ 0.20%) 1.01s 1.04s
Check Time 1.48s (± 0.87%) 1.47s (± 0.52%) -0.01s (- 0.74%) 1.45s 1.49s
Emit Time 0.07s (± 0.00%) 0.07s (± 0.00%) 0.00s ( 0.00%) 0.07s 0.07s
Total Time 5.09s (± 0.37%) 5.08s (± 0.37%) -0.01s (- 0.12%) 5.06s 5.13s
Angular - node (v14.15.1, x64)
Memory used 333,695k (± 0.01%) 333,664k (± 0.01%) -31k (- 0.01%) 333,555k 333,787k
Parse Time 2.04s (± 0.63%) 2.04s (± 0.52%) +0.00s (+ 0.15%) 2.02s 2.07s
Bind Time 0.87s (± 0.42%) 0.87s (± 0.66%) +0.00s (+ 0.46%) 0.86s 0.88s
Check Time 5.60s (± 0.39%) 5.63s (± 0.41%) +0.03s (+ 0.50%) 5.57s 5.68s
Emit Time 6.30s (± 0.48%) 6.31s (± 0.98%) +0.01s (+ 0.14%) 6.24s 6.53s
Total Time 14.81s (± 0.36%) 14.85s (± 0.54%) +0.04s (+ 0.28%) 14.74s 15.11s
Compiler-Unions - node (v14.15.1, x64)
Memory used 192,146k (± 0.12%) 192,283k (± 0.02%) +137k (+ 0.07%) 192,179k 192,334k
Parse Time 0.84s (± 0.70%) 0.85s (± 0.56%) +0.00s (+ 0.36%) 0.84s 0.86s
Bind Time 0.56s (± 0.61%) 0.56s (± 0.84%) +0.00s (+ 0.54%) 0.55s 0.57s
Check Time 7.53s (± 0.56%) 7.54s (± 0.74%) +0.01s (+ 0.12%) 7.46s 7.72s
Emit Time 2.50s (± 1.04%) 2.50s (± 0.76%) -0.00s (- 0.16%) 2.47s 2.56s
Total Time 11.44s (± 0.33%) 11.45s (± 0.48%) +0.01s (+ 0.09%) 11.35s 11.61s
Monaco - node (v14.15.1, x64)
Memory used 325,653k (± 0.00%) 325,626k (± 0.00%) -27k (- 0.01%) 325,596k 325,658k
Parse Time 1.57s (± 0.62%) 1.57s (± 0.92%) +0.00s (+ 0.25%) 1.56s 1.61s
Bind Time 0.77s (± 0.52%) 0.78s (± 0.75%) +0.01s (+ 0.78%) 0.77s 0.79s
Check Time 5.52s (± 0.48%) 5.54s (± 0.49%) +0.02s (+ 0.38%) 5.48s 5.60s
Emit Time 3.31s (± 0.57%) 3.33s (± 0.83%) +0.02s (+ 0.60%) 3.27s 3.41s
Total Time 11.17s (± 0.33%) 11.22s (± 0.46%) +0.05s (+ 0.44%) 11.13s 11.34s
TFS - node (v14.15.1, x64)
Memory used 289,126k (± 0.01%) 289,124k (± 0.01%) -2k (- 0.00%) 289,088k 289,173k
Parse Time 1.37s (± 1.63%) 1.37s (± 1.82%) +0.00s (+ 0.00%) 1.34s 1.43s
Bind Time 0.72s (± 1.38%) 0.72s (± 1.05%) +0.00s (+ 0.14%) 0.71s 0.74s
Check Time 5.18s (± 0.58%) 5.21s (± 0.43%) +0.03s (+ 0.60%) 5.17s 5.26s
Emit Time 3.50s (± 1.94%) 3.55s (± 2.14%) +0.05s (+ 1.49%) 3.38s 3.66s
Total Time 10.76s (± 0.78%) 10.84s (± 0.80%) +0.08s (+ 0.78%) 10.61s 11.02s
material-ui - node (v14.15.1, x64)
Memory used 444,428k (± 0.00%) 444,434k (± 0.00%) +5k (+ 0.00%) 444,408k 444,466k
Parse Time 1.87s (± 0.40%) 1.87s (± 0.53%) +0.00s (+ 0.11%) 1.85s 1.90s
Bind Time 0.69s (± 0.52%) 0.69s (± 0.72%) +0.00s (+ 0.14%) 0.69s 0.71s
Check Time 13.06s (± 0.70%) 13.00s (± 0.50%) -0.06s (- 0.47%) 12.88s 13.14s
Emit Time 0.00s (± 0.00%) 0.00s (± 0.00%) 0.00s ( NaN%) 0.00s 0.00s
Total Time 15.62s (± 0.61%) 15.56s (± 0.41%) -0.06s (- 0.36%) 15.46s 15.73s
xstate - node (v14.15.1, x64)
Memory used 535,157k (± 0.01%) 535,145k (± 0.00%) -12k (- 0.00%) 535,112k 535,171k
Parse Time 2.58s (± 0.29%) 2.58s (± 0.50%) +0.00s (+ 0.00%) 2.57s 2.62s
Bind Time 1.14s (± 0.65%) 1.15s (± 1.35%) +0.01s (+ 0.44%) 1.13s 1.20s
Check Time 1.52s (± 0.59%) 1.51s (± 0.49%) -0.00s (- 0.13%) 1.50s 1.54s
Emit Time 0.07s (± 0.00%) 0.07s (± 0.00%) 0.00s ( 0.00%) 0.07s 0.07s
Total Time 5.32s (± 0.27%) 5.32s (± 0.28%) +0.00s (+ 0.04%) 5.29s 5.35s
System
Machine Namets-ci-ubuntu
Platformlinux 4.4.0-210-generic
Architecturex64
Available Memory16 GB
Available Memory1 GB
CPUs4 × Intel(R) Core(TM) i7-4770 CPU @ 3.40GHz
Hosts
  • node (v10.16.3, x64)
  • node (v12.1.0, x64)
  • node (v14.15.1, x64)
Scenarios
  • Angular - node (v10.16.3, x64)
  • Angular - node (v12.1.0, x64)
  • Angular - node (v14.15.1, x64)
  • Compiler-Unions - node (v10.16.3, x64)
  • Compiler-Unions - node (v12.1.0, x64)
  • Compiler-Unions - node (v14.15.1, x64)
  • Monaco - node (v10.16.3, x64)
  • Monaco - node (v12.1.0, x64)
  • Monaco - node (v14.15.1, x64)
  • TFS - node (v10.16.3, x64)
  • TFS - node (v12.1.0, x64)
  • TFS - node (v14.15.1, x64)
  • material-ui - node (v10.16.3, x64)
  • material-ui - node (v12.1.0, x64)
  • material-ui - node (v14.15.1, x64)
  • xstate - node (v10.16.3, x64)
  • xstate - node (v12.1.0, x64)
  • xstate - node (v14.15.1, x64)
Benchmark Name Iterations
Current 49233 10
Baseline main 10

Developer Information:

Download Benchmark

@andrewbranch
Copy link
Member Author

@typescript-bot cherry-pick this to release-4.7

@typescript-bot
Copy link
Collaborator

typescript-bot commented May 25, 2022 •
edited
Loading

Heya @andrewbranch, I've started to run the task to cherry-pick this into release-4.7 on this PR at 1ab6396. You can monitor the build here.

@typescript-bot typescript-bot mentioned this pull request May 25, 2022
Merged
@typescript-bot
Copy link
Collaborator

Hey @andrewbranch, I've opened #49244 for you.

typescript-bot pushed a commit to typescript-bot/TypeScript that referenced this pull request May 25, 2022
@andrewbranch @typescript-bot
Cherry-pick PR microsoft#49233 into release-4.7
0f7049b 
Component commits:
1ab6396 Fix extensions for noDtsResolution in node16/nodenext
sheetalkamat
sheetalkamat reviewed May 25, 2022
View reviewed changes
src/compiler/moduleNameResolver.ts
Comment on lines +1300 to +1303
let extensions = compilerOptions.noDtsResolution ? [Extensions.TsOnly, Extensions.JavaScript] : tsExtensions;
if (compilerOptions.resolveJsonModule) {
extensions = [...extensions, Extensions.Json];
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
let extensions = compilerOptions.noDtsResolution ? [Extensions.TsOnly, Extensions.JavaScript] : tsExtensions;
if (compilerOptions.resolveJsonModule) {
extensions = [...extensions, Extensions.Json];
}
const extensions = compilerOptions.noDtsResolution ?
compilerOptions.resolveJsonModule ? [Extensions.TsOnly, Extensions.JavaScript, Extensions.Json] : [Extensions.TsOnly, Extensions.JavaScript] :
compilerOptions.resolveJsonModule ? tsPlusJsonExtensions : tsExtensions;

@andrewbranch andrewbranch merged commit 77ffb96 into microsoft:main May 25, 2022
@andrewbranch andrewbranch deleted the bug/49003/nodenext branch May 25, 2022 22:27
andrewbranch added a commit that referenced this pull request May 25, 2022
@andrewbranch
Cherry-pick PR #49233 into release-4.7 (#49244)
697df6f 
Component commits:
1ab6396 Fix extensions for noDtsResolution in node16/nodenext

Co-authored-by: Andrew Branch <andrew@wheream.io>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sheetalkamat sheetalkamat sheetalkamat left review comments

@weswigham weswigham weswigham approved these changes

Assignees

@andrewbranch andrewbranch

Labels
Author: Team For Uncommitted Bug PR for untriaged, rejected, closed or missing bug
Projects
None yet
Milestone
TypeScript 4.7.3
Development

Successfully merging this pull request may close these issues.
5 participants
@andrewbranch @DanielRosenwasser @typescript-bot @weswigham @sheetalkamat