Skip to content

Commit aa89efc

Browse files
GulajavaMinistudioGulajavaMinistudio
authored
Merge pull request #597 from microsoft/main
Create a new pull request by comparing changes across two branches
2 parents 18a4c5b + a53c37d commit aa89efc

File tree

15 files changed

+1015
-151
lines changed

15 files changed

+1015
-151
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,9 @@ jobs:
9595
name: coverage
9696
path: coverage
9797

98-
- uses: codecov/codecov-action@e28ff129e5465c2c0dcc6f003fc735cb6ae0c673 # v4.5.0
98+
- uses: codecov/codecov-action@b9fd7d16f6d7d1b5d2bec1a2887e65ceed900238 # v4.6.0
9999
with:
100-
use_oidc: true
100+
use_oidc: ${{ !(github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork) }}
101101
disable_search: true
102102
files: ./coverage/codecov.json
103103

@@ -137,7 +137,7 @@ jobs:
137137
node-version: 'lts/*'
138138
- run: npm ci
139139

140-
- uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
140+
- uses: actions/cache@2cdf405574d6ef1f33a1d12acccd3ae82f47b3f2 # v4.1.0
141141
with:
142142
path: ~/.cache/dprint
143143
key: ${{ runner.os }}-dprint-${{ hashFiles('package-lock.json', '.dprint.jsonc') }}

‎.github/workflows/codeql.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646

4747
# Initializes the CodeQL tools for scanning.
4848
- name: Initialize CodeQL
49-
uses: github/codeql-action/init@461ef6c76dfe95d5c364de2f431ddbd31a417628 # v3.26.9
49+
uses: github/codeql-action/init@6db8d6351fd0be61f9ed8ebd12ccd35dcec51fea # v3.26.11
5050
with:
5151
config-file: ./.github/codeql/codeql-configuration.yml
5252
# Override language selection by uncommenting this and choosing your languages
@@ -56,7 +56,7 @@ jobs:
5656
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
5757
# If this step fails, then you should remove it and run the build manually (see below).
5858
- name: Autobuild
59-
uses: github/codeql-action/autobuild@461ef6c76dfe95d5c364de2f431ddbd31a417628 # v3.26.9
59+
uses: github/codeql-action/autobuild@6db8d6351fd0be61f9ed8ebd12ccd35dcec51fea # v3.26.11
6060

6161
# ℹ️ Command-line programs to run using the OS shell.
6262
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -70,4 +70,4 @@ jobs:
7070
# make release
7171

7272
- name: Perform CodeQL Analysis
73-
uses: github/codeql-action/analyze@461ef6c76dfe95d5c364de2f431ddbd31a417628 # v3.26.9
73+
uses: github/codeql-action/analyze@6db8d6351fd0be61f9ed8ebd12ccd35dcec51fea # v3.26.11

‎.github/workflows/scorecard.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,6 @@ jobs:
5555

5656
# Upload the results to GitHub's code scanning dashboard.
5757
- name: 'Upload to code-scanning'
58-
uses: github/codeql-action/upload-sarif@461ef6c76dfe95d5c364de2f431ddbd31a417628 # v3.26.9
58+
uses: github/codeql-action/upload-sarif@6db8d6351fd0be61f9ed8ebd12ccd35dcec51fea # v3.26.11
5959
with:
6060
sarif_file: results.sarif

‎src/loc/lcl/chs/diagnosticMessages/diagnosticMessages.generated.json.lcl‎

Lines changed: 84 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7884,11 +7884,11 @@
78847884
</Str>
78857885
<Disp Icon="Str" />
78867886
</Item>
7887-
<Item ItemId=";Generator_implicitly_has_yield_type_0_because_it_does_not_yield_any_values_Consider_supplying_a_retu_7025" ItemType="0" PsrId="306" Leaf="true">
7887+
<Item ItemId=";Generator_implicitly_has_yield_type_0_Consider_supplying_a_return_type_annotation_7025" ItemType="0" PsrId="306" Leaf="true">
78887888
<Str Cat="Text">
7889-
<Val><![CDATA[Generator implicitly has yield type '{0}' because it does not yield any values. Consider supplying a return type annotation.]]></Val>
7889+
<Val><![CDATA[Generator implicitly has yield type '{0}'. Consider supplying a return type annotation.]]></Val>
78907890
<Tgt Cat="Text" Stat="Loc" Orig="New">
7891-
<Val><![CDATA[生成器隐式具有产出类型 "{0}" ，因为它不生成任何值。请考虑提供一个返回类型注释。]]></Val>
7891+
<Val><![CDATA[生成器隐式具有 yield 类型 ‘{0}’。请考虑提供一个返回类型注释。]]></Val>
78927892
</Tgt>
78937893
</Str>
78947894
<Disp Icon="Str" />
@@ -8424,6 +8424,15 @@
84248424
</Str>
84258425
<Disp Icon="Str" />
84268426
</Item>
8427+
<Item ItemId=";Importing_a_JSON_file_into_an_ECMAScript_module_requires_a_type_Colon_json_import_attribute_when_mod_1543" ItemType="0" PsrId="306" Leaf="true">
8428+
<Str Cat="Text">
8429+
<Val><![CDATA[Importing a JSON file into an ECMAScript module requires a 'type: "json"' import attribute when 'module' is set to '{0}'.]]></Val>
8430+
<Tgt Cat="Text" Stat="Loc" Orig="New">
8431+
<Val><![CDATA[当 ‘module’ 设置为 ‘{0}’ 时，将 JSON 文件导入 ECMAScript 模块需要 ‘type: “json”’ 导入属性。]]></Val>
8432+
</Tgt>
8433+
</Str>
8434+
<Disp Icon="Str" />
8435+
</Item>
84278436
<Item ItemId=";Imports_are_not_permitted_in_module_augmentations_Consider_moving_them_to_the_enclosing_external_mod_2667" ItemType="0" PsrId="306" Leaf="true">
84288437
<Str Cat="Text">
84298438
<Val><![CDATA[Imports are not permitted in module augmentations. Consider moving them to the enclosing external module.]]></Val>
@@ -9840,6 +9849,15 @@
98409849
</Str>
98419850
<Disp Icon="Str" />
98429851
</Item>
9852+
<Item ItemId=";Named_imports_from_a_JSON_file_into_an_ECMAScript_module_are_not_allowed_when_module_is_set_to_0_1544" ItemType="0" PsrId="306" Leaf="true">
9853+
<Str Cat="Text">
9854+
<Val><![CDATA[Named imports from a JSON file into an ECMAScript module are not allowed when 'module' is set to '{0}'.]]></Val>
9855+
<Tgt Cat="Text" Stat="Loc" Orig="New">
9856+
<Val><![CDATA[当 ‘module’ 设置为 ‘{0}’ 时，不允许从 JSON 文件到 ECMAScript 模块中的命名导入。]]></Val>
9857+
</Tgt>
9858+
</Str>
9859+
<Disp Icon="Str" />
9860+
</Item>
98439861
<Item ItemId=";Named_property_0_of_types_1_and_2_are_not_identical_2319" ItemType="0" PsrId="306" Leaf="true">
98449862
<Str Cat="Text">
98459863
<Val><![CDATA[Named property '{0}' of types '{1}' and '{2}' are not identical.]]></Val>
@@ -10602,15 +10620,6 @@
1060210620
</Str>
1060310621
<Disp Icon="Str" />
1060410622
</Item>
10605-
<Item ItemId=";Option_tsBuildInfoFile_cannot_be_specified_without_specifying_option_incremental_or_composite_or_if__5111" ItemType="0" PsrId="306" Leaf="true">
10606-
<Str Cat="Text">
10607-
<Val><![CDATA[Option 'tsBuildInfoFile' cannot be specified without specifying option 'incremental' or 'composite' or if not running 'tsc -b'.]]></Val>
10608-
<Tgt Cat="Text" Stat="Loc" Orig="New">
10609-
<Val><![CDATA[如果未指定选项“incremental”或“composite”或未运行“tsc -b”，则无法指定选项“tsBuildInfoFile”。]]></Val>
10610-
</Tgt>
10611-
</Str>
10612-
<Disp Icon="Str" />
10613-
</Item>
1061410623
<Item ItemId=";Option_verbatimModuleSyntax_cannot_be_used_when_module_is_set_to_UMD_AMD_or_System_5105" ItemType="0" PsrId="306" Leaf="true">
1061510624
<Str Cat="Text">
1061610625
<Val><![CDATA[Option 'verbatimModuleSyntax' cannot be used when 'module' is set to 'UMD', 'AMD', or 'System'.]]></Val>
@@ -13059,6 +13068,15 @@
1305913068
</Str>
1306013069
<Disp Icon="Str" />
1306113070
</Item>
13071+
<Item ItemId=";Rewrite_ts_tsx_mts_and_cts_file_extensions_in_relative_import_paths_to_their_JavaScript_equivalent_i_6421" ItemType="0" PsrId="306" Leaf="true">
13072+
<Str Cat="Text">
13073+
<Val><![CDATA[Rewrite '.ts', '.tsx', '.mts', and '.cts' file extensions in relative import paths to their JavaScript equivalent in output files.]]></Val>
13074+
<Tgt Cat="Text" Stat="Loc" Orig="New">
13075+
<Val><![CDATA[将相对导入路径中的 ‘.ts’、‘.tsx’、‘.mts’ 和 ‘.cts’ 文件扩展名改写为其在输出文件中的 JavaScript 等效项。]]></Val>
13076+
</Tgt>
13077+
</Str>
13078+
<Disp Icon="Str" />
13079+
</Item>
1306213080
<Item ItemId=";Right_operand_of_is_unreachable_because_the_left_operand_is_never_nullish_2869" ItemType="0" PsrId="306" Leaf="true">
1306313081
<Str Cat="Text">
1306413082
<Val><![CDATA[Right operand of ?? is unreachable because the left operand is never nullish.]]></Val>
@@ -15090,6 +15108,24 @@
1509015108
</Str>
1509115109
<Disp Icon="Str" />
1509215110
</Item>
15111+
<Item ItemId=";This_JSX_tag_requires_0_to_be_in_scope_but_it_could_not_be_found_2874" ItemType="0" PsrId="306" Leaf="true">
15112+
<Str Cat="Text">
15113+
<Val><![CDATA[This JSX tag requires '{0}' to be in scope, but it could not be found.]]></Val>
15114+
<Tgt Cat="Text" Stat="Loc" Orig="New">
15115+
<Val><![CDATA[此 JSX 标记要求 ‘{0}’ 在范围内，但找不到它。]]></Val>
15116+
</Tgt>
15117+
</Str>
15118+
<Disp Icon="Str" />
15119+
</Item>
15120+
<Item ItemId=";This_JSX_tag_requires_the_module_path_0_to_exist_but_none_could_be_found_Make_sure_you_have_types_fo_2875" ItemType="0" PsrId="306" Leaf="true">
15121+
<Str Cat="Text">
15122+
<Val><![CDATA[This JSX tag requires the module path '{0}' to exist, but none could be found. Make sure you have types for the appropriate package installed.]]></Val>
15123+
<Tgt Cat="Text" Stat="Loc" Orig="New">
15124+
<Val><![CDATA[此 JSX 标记要求模块路径 ‘{0}’ 存在，但找不到任何路径。请确保已安装相应包的类型。]]></Val>
15125+
</Tgt>
15126+
</Str>
15127+
<Disp Icon="Str" />
15128+
</Item>
1509315129
<Item ItemId=";This_JSX_tag_s_0_prop_expects_a_single_child_of_type_1_but_multiple_children_were_provided_2746" ItemType="0" PsrId="306" Leaf="true">
1509415130
<Str Cat="Text">
1509515131
<Val><![CDATA[This JSX tag's '{0}' prop expects a single child of type '{1}', but multiple children were provided.]]></Val>
@@ -15243,6 +15279,24 @@
1524315279
</Str>
1524415280
<Disp Icon="Str" />
1524515281
</Item>
15282+
<Item ItemId=";This_import_path_is_unsafe_to_rewrite_because_it_resolves_to_another_project_and_the_relative_path_b_2878" ItemType="0" PsrId="306" Leaf="true">
15283+
<Str Cat="Text">
15284+
<Val><![CDATA[This import path is unsafe to rewrite because it resolves to another project, and the relative path between the projects' output files is not the same as the relative path between its input files.]]></Val>
15285+
<Tgt Cat="Text" Stat="Loc" Orig="New">
15286+
<Val><![CDATA[重写此导入路径并不安全，因为它会解析为另一个项目，并且项目的输出文件之间的相对路径与其输入文件之间的相对路径不同。]]></Val>
15287+
</Tgt>
15288+
</Str>
15289+
<Disp Icon="Str" />
15290+
</Item>
15291+
<Item ItemId=";This_import_uses_a_0_extension_to_resolve_to_an_input_TypeScript_file_but_will_not_be_rewritten_duri_2877" ItemType="0" PsrId="306" Leaf="true">
15292+
<Str Cat="Text">
15293+
<Val><![CDATA[This import uses a '{0}' extension to resolve to an input TypeScript file, but will not be rewritten during emit because it is not a relative path.]]></Val>
15294+
<Tgt Cat="Text" Stat="Loc" Orig="New">
15295+
<Val><![CDATA[此导入使用 ‘{0}’ 扩展解析为输入 TypeScript 文件，但不会在发出期间重写，因为它不是相对路径。]]></Val>
15296+
</Tgt>
15297+
</Str>
15298+
<Disp Icon="Str" />
15299+
</Item>
1524615300
<Item ItemId=";This_is_the_declaration_being_augmented_Consider_moving_the_augmenting_declaration_into_the_same_fil_6233" ItemType="0" PsrId="306" Leaf="true">
1524715301
<Str Cat="Text">
1524815302
<Val><![CDATA[This is the declaration being augmented. Consider moving the augmenting declaration into the same file.]]></Val>
@@ -15450,6 +15504,15 @@
1545015504
</Str>
1545115505
<Disp Icon="Str" />
1545215506
</Item>
15507+
<Item ItemId=";This_relative_import_path_is_unsafe_to_rewrite_because_it_looks_like_a_file_name_but_actually_resolv_2876" ItemType="0" PsrId="306" Leaf="true">
15508+
<Str Cat="Text">
15509+
<Val><![CDATA[This relative import path is unsafe to rewrite because it looks like a file name, but actually resolves to "{0}".]]></Val>
15510+
<Tgt Cat="Text" Stat="Loc" Orig="New">
15511+
<Val><![CDATA[重写此相对导入路径并不安全，因为它看起来像文件名，但实际上解析为 ‘{0}’。]]></Val>
15512+
</Tgt>
15513+
</Str>
15514+
<Disp Icon="Str" />
15515+
</Item>
1545315516
<Item ItemId=";This_spread_always_overwrites_this_property_2785" ItemType="0" PsrId="306" Leaf="true">
1545415517
<Str Cat="Text">
1545515518
<Val><![CDATA[This spread always overwrites this property.]]></Val>
@@ -17025,6 +17088,15 @@
1702517088
</Str>
1702617089
<Disp Icon="Str" />
1702717090
</Item>
17091+
<Item ItemId=";Using_JSX_fragments_requires_fragment_factory_0_to_be_in_scope_but_it_could_not_be_found_2879" ItemType="0" PsrId="306" Leaf="true">
17092+
<Str Cat="Text">
17093+
<Val><![CDATA[Using JSX fragments requires fragment factory '{0}' to be in scope, but it could not be found.]]></Val>
17094+
<Tgt Cat="Text" Stat="Loc" Orig="New">
17095+
<Val><![CDATA[使用 JSX 片段需要片段工厂 ‘{0}’ 在范围内，但找不到它。]]></Val>
17096+
</Tgt>
17097+
</Str>
17098+
<Disp Icon="Str" />
17099+
</Item>
1702817100
<Item ItemId=";Using_a_string_in_a_for_of_statement_is_only_supported_in_ECMAScript_5_and_higher_2494" ItemType="0" PsrId="306" Leaf="true">
1702917101
<Str Cat="Text">
1703017102
<Val><![CDATA[Using a string in a 'for...of' statement is only supported in ECMAScript 5 and higher.]]></Val>

0 commit comments

Comments
 (0)