Skip to content

Commit 050880c

Browse files
Bump version to 6.0.3 and LKG
1 parent eeae9dd commit 050880c

File tree

5 files changed

+32
-11
lines changed

5 files changed

+32
-11
lines changed

lib/_tsc.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ and limitations under the License.
1818

1919
// src/compiler/corePublic.ts
2020
var versionMajorMinor = "6.0";
21-
var version = "6.0.2";
21+
var version = "6.0.3";
2222

2323
// src/compiler/core.ts
2424
var emptyArray = [];
@@ -45186,6 +45186,8 @@ function getContainerFlags(node) {
4518645186
return 1 /* IsContainer */ | 4 /* IsControlFlowContainer */ | 32 /* HasLocals */ | 8 /* IsFunctionLike */ | 16 /* IsFunctionExpression */ | 256 /* PropagatesThisKeyword */;
4518745187
case 269 /* ModuleBlock */:
4518845188
return 4 /* IsControlFlowContainer */;
45189+
case 173 /* PropertyDeclaration */:
45190+
return node.initializer ? 4 /* IsControlFlowContainer */ : 0 /* None */;
4518945191
case 300 /* CatchClause */:
4519045192
case 249 /* ForStatement */:
4519145193
case 250 /* ForInStatement */:

lib/typescript.js

Lines changed: 25 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2289,7 +2289,7 @@ module.exports = __toCommonJS(typescript_exports);
22892289

22902290
// src/compiler/corePublic.ts
22912291
var versionMajorMinor = "6.0";
2292-
var version = "6.0.2";
2292+
var version = "6.0.3";
22932293
var Comparison = /* @__PURE__ */ ((Comparison3) => {
22942294
Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
22952295
Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -49721,6 +49721,8 @@ function getContainerFlags(node) {
4972149721
return 1 /* IsContainer */ | 4 /* IsControlFlowContainer */ | 32 /* HasLocals */ | 8 /* IsFunctionLike */ | 16 /* IsFunctionExpression */ | 256 /* PropagatesThisKeyword */;
4972249722
case 269 /* ModuleBlock */:
4972349723
return 4 /* IsControlFlowContainer */;
49724+
case 173 /* PropertyDeclaration */:
49725+
return node.initializer ? 4 /* IsControlFlowContainer */ : 0 /* None */;
4972449726
case 300 /* CatchClause */:
4972549727
case 249 /* ForStatement */:
4972649728
case 250 /* ForInStatement */:
@@ -139651,7 +139653,8 @@ var NameValidationResult = /* @__PURE__ */ ((NameValidationResult2) => {
139651139653
NameValidationResult2[NameValidationResult2["NameTooLong"] = 2] = "NameTooLong";
139652139654
NameValidationResult2[NameValidationResult2["NameStartsWithDot"] = 3] = "NameStartsWithDot";
139653139655
NameValidationResult2[NameValidationResult2["NameStartsWithUnderscore"] = 4] = "NameStartsWithUnderscore";
139654-
NameValidationResult2[NameValidationResult2["NameContainsNonURISafeCharacters"] = 5] = "NameContainsNonURISafeCharacters";
139656+
NameValidationResult2[NameValidationResult2["NameContainsInvalidCharacters"] = 5] = "NameContainsInvalidCharacters";
139657+
NameValidationResult2[NameValidationResult2["NameContainsNonURISafeCharacters"] = 5 /* NameContainsInvalidCharacters */] = "NameContainsNonURISafeCharacters";
139655139658
return NameValidationResult2;
139656139659
})(NameValidationResult || {});
139657139660
var maxPackageNameLength = 214;
@@ -139697,8 +139700,8 @@ function validatePackageNameWorker(packageName, supportScopedPackage) {
139697139700
return 0 /* Ok */;
139698139701
}
139699139702
}
139700-
if (encodeURIComponent(packageName) !== packageName) {
139701-
return 5 /* NameContainsNonURISafeCharacters */;
139703+
if (!/^[\w.-]+$/.test(packageName)) {
139704+
return 5 /* NameContainsInvalidCharacters */;
139702139705
}
139703139706
return 0 /* Ok */;
139704139707
}
@@ -139722,8 +139725,8 @@ function renderPackageNameValidationFailureWorker(typing, result, name, isScopeN
139722139725
return `'${typing}':: ${kind} name '${name}' cannot start with '.'`;
139723139726
case 4 /* NameStartsWithUnderscore */:
139724139727
return `'${typing}':: ${kind} name '${name}' cannot start with '_'`;
139725-
case 5 /* NameContainsNonURISafeCharacters */:
139726-
return `'${typing}':: ${kind} name '${name}' contains non URI safe characters`;
139728+
case 5 /* NameContainsInvalidCharacters */:
139729+
return `'${typing}':: ${kind} name '${name}' contains invalid characters`;
139727139730
case 0 /* Ok */:
139728139731
return Debug.fail();
139729139732
// Shouldn't have called this.
@@ -186596,6 +186599,22 @@ var TypingsInstaller = class {
186596186599
/** @internal */
186597186600
installPackage(req) {
186598186601
const { fileName, packageName, projectName, projectRootPath, id } = req;
186602+
const validationResult = ts_JsTyping_exports.validatePackageName(packageName);
186603+
if (validationResult !== ts_JsTyping_exports.NameValidationResult.Ok) {
186604+
const message = ts_JsTyping_exports.renderPackageNameValidationFailure(validationResult, packageName);
186605+
if (this.log.isEnabled()) {
186606+
this.log.writeLine(message);
186607+
}
186608+
const response = {
186609+
kind: ActionPackageInstalled,
186610+
projectName,
186611+
id,
186612+
success: false,
186613+
message
186614+
};
186615+
this.sendResponse(response);
186616+
return;
186617+
}
186599186618
const cwd = forEachAncestorDirectory(getDirectoryPath(fileName), (directory) => {
186600186619
if (this.installTypingHost.fileExists(combinePaths(directory, "package.json"))) {
186601186620
return directory;

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "typescript",
33
"author": "Microsoft Corp.",
44
"homepage": "https://www.typescriptlang.org/",
5-
"version": "6.0.2",
5+
"version": "6.0.3",
66
"license": "Apache-2.0",
77
"description": "TypeScript is a language for application scale JavaScript development",
88
"keywords": [

src/compiler/corePublic.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
export const versionMajorMinor = "6.0";
44
// The following is baselined as a literal template type without intervention
55
/** The version of the TypeScript compiler release */
6-
export const version = "6.0.2" as string;
6+
export const version = "6.0.3" as string;
77

88
/**
99
* Type of objects whose values are all of the same type.

0 commit comments

Comments
 (0)