Skip to content

build: update to TypeScript 4.7 final #23223

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 1 commit into from
May 25, 2022
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
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@
"tree-kill": "1.2.2",
"ts-node": "^10.0.0",
"tslib": "2.4.0",
"typescript": "4.7.1-rc",
"typescript": "~4.7.2",
"verdaccio": "5.10.2",
"verdaccio-auth-memory": "^10.0.0",
"webpack": "5.72.1",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"dependencies": {
"@angular-devkit/core": "^<%= coreVersion %>",
"@angular-devkit/schematics": "^<%= schematicsVersion %>",
"typescript": "~4.6.2"
"typescript": "~4.7.2"
},
"devDependencies": {
"@types/node": "^14.15.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"dependencies": {
"@angular-devkit/core": "^<%= coreVersion %>",
"@angular-devkit/schematics": "^<%= schematicsVersion %>",
"typescript": "~4.6.2"
"typescript": "~4.7.2"
},
"devDependencies": {
"@types/node": "^14.15.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/ngtools/webpack/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"@angular-devkit/core": "0.0.0-PLACEHOLDER",
"@angular/compiler": "14.0.0-next.16",
"@angular/compiler-cli": "14.0.0-next.16",
"typescript": "4.7.1-rc",
"typescript": "~4.7.2",
"webpack": "5.72.1"
}
}
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
load("//tools:defaults.bzl", "ts_library")

# files fetched on 2022-05-06 from
# https://github.com/microsoft/TypeScript/releases/tag/v4.7-rc
# files fetched on 2022-05-25 from
# https://github.com/microsoft/TypeScript/releases/tag/v4.7.2

# Commands to download:
# curl https://raw.githubusercontent.com/microsoft/TypeScript/v4.7-rc/lib/typescript.d.ts -o packages/schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript.d.ts
# curl https://raw.githubusercontent.com/microsoft/TypeScript/v4.7-rc/lib/typescript.js -o packages/schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript.js
# curl https://raw.githubusercontent.com/microsoft/TypeScript/v4.7.2/lib/typescript.d.ts -o packages/schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript.d.ts
# curl https://raw.githubusercontent.com/microsoft/TypeScript/v4.7.2/lib/typescript.js -o packages/schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript.js

licenses(["notice"]) # Apache 2.0

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ var ts;
// The following is baselined as a literal template type without intervention
/** The version of the TypeScript compiler release */
// eslint-disable-next-line @typescript-eslint/no-inferrable-types
ts.version = "".concat(ts.versionMajorMinor, ".1-rc");
ts.version = "4.7.2";
/* @internal */
var Comparison;
(function (Comparison) {
Expand Down Expand Up @@ -59090,9 +59090,9 @@ var ts;
t.flags & 2097152 /* TypeFlags.Intersection */ ? getApparentTypeOfIntersectionType(t) :
t.flags & 402653316 /* TypeFlags.StringLike */ ? globalStringType :
t.flags & 296 /* TypeFlags.NumberLike */ ? globalNumberType :
t.flags & 2112 /* TypeFlags.BigIntLike */ ? getGlobalBigIntType(/*reportErrors*/ languageVersion >= 7 /* ScriptTarget.ES2020 */) :
t.flags & 2112 /* TypeFlags.BigIntLike */ ? getGlobalBigIntType() :
t.flags & 528 /* TypeFlags.BooleanLike */ ? globalBooleanType :
t.flags & 12288 /* TypeFlags.ESSymbolLike */ ? getGlobalESSymbolType(/*reportErrors*/ languageVersion >= 2 /* ScriptTarget.ES2015 */) :
t.flags & 12288 /* TypeFlags.ESSymbolLike */ ? getGlobalESSymbolType() :
t.flags & 67108864 /* TypeFlags.NonPrimitive */ ? emptyObjectType :
t.flags & 4194304 /* TypeFlags.Index */ ? keyofConstraintType :
t.flags & 2 /* TypeFlags.Unknown */ && !strictNullChecks ? emptyObjectType :
Expand Down Expand Up @@ -60667,8 +60667,8 @@ var ts;
function getGlobalESSymbolConstructorTypeSymbol(reportErrors) {
return deferredGlobalESSymbolConstructorTypeSymbol || (deferredGlobalESSymbolConstructorTypeSymbol = getGlobalTypeSymbol("SymbolConstructor", reportErrors));
}
function getGlobalESSymbolType(reportErrors) {
return (deferredGlobalESSymbolType || (deferredGlobalESSymbolType = getGlobalType("Symbol", /*arity*/ 0, reportErrors))) || emptyObjectType;
function getGlobalESSymbolType() {
return (deferredGlobalESSymbolType || (deferredGlobalESSymbolType = getGlobalType("Symbol", /*arity*/ 0, /*reportErrors*/ false))) || emptyObjectType;
}
function getGlobalPromiseType(reportErrors) {
return (deferredGlobalPromiseType || (deferredGlobalPromiseType = getGlobalType("Promise", /*arity*/ 1, reportErrors))) || emptyGenericType;
Expand Down Expand Up @@ -60732,8 +60732,8 @@ var ts;
deferredGlobalAwaitedSymbol || (deferredGlobalAwaitedSymbol = getGlobalTypeAliasSymbol("Awaited", /*arity*/ 1, reportErrors) || (reportErrors ? unknownSymbol : undefined));
return deferredGlobalAwaitedSymbol === unknownSymbol ? undefined : deferredGlobalAwaitedSymbol;
}
function getGlobalBigIntType(reportErrors) {
return (deferredGlobalBigIntType || (deferredGlobalBigIntType = getGlobalType("BigInt", /*arity*/ 0, reportErrors))) || emptyObjectType;
function getGlobalBigIntType() {
return (deferredGlobalBigIntType || (deferredGlobalBigIntType = getGlobalType("BigInt", /*arity*/ 0, /*reportErrors*/ false))) || emptyObjectType;
}
/**
* Instantiates a global type that is generic with some element type, and returns that instantiation.
Expand Down Expand Up @@ -64885,7 +64885,7 @@ var ts;
if ((globalStringType === source && stringType === target) ||
(globalNumberType === source && numberType === target) ||
(globalBooleanType === source && booleanType === target) ||
(getGlobalESSymbolType(/*reportErrors*/ false) === source && esSymbolType === target)) {
(getGlobalESSymbolType() === source && esSymbolType === target)) {
reportError(ts.Diagnostics._0_is_a_primitive_but_1_is_a_wrapper_object_Prefer_using_0_when_possible, targetType, sourceType);
}
}
Expand Down Expand Up @@ -82697,7 +82697,7 @@ var ts;
var childSymbol = getSymbolAtLocation(childNode);
if (childSymbol && childSymbol === testedSymbol) {
// If the test was a simple identifier, the above check is sufficient
if (ts.isIdentifier(expr)) {
if (ts.isIdentifier(expr) || ts.isIdentifier(testedNode) && ts.isBinaryExpression(testedNode.parent)) {
return true;
}
// Otherwise we need to ensure the symbol is called on the same target
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"rxjs": "~7.5.0",
"tslib": "^2.3.0",
"ts-node": "~10.7.0",
"typescript": "~4.6.2",
"typescript": "~4.7.2",
"zone.js": "~0.11.4"
}
}
2 changes: 1 addition & 1 deletion tests/legacy-cli/e2e/assets/webpack/test-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"devDependencies": {
"sass": "^1.32.8",
"sass-loader": "^11.0.1",
"typescript": "~4.3.2",
"typescript": "~4.7.2",
"webpack": "^5.27.0",
"webpack-cli": "^4.5.0"
}
Expand Down
10 changes: 5 additions & 5 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -10201,16 +10201,16 @@ typedarray@^0.0.6:
resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=

typescript@4.7.1-rc:
version "4.7.1-rc"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.7.1-rc.tgz#23a0517d36c56de887b4457f29e2d265647bbd7c"
integrity sha512-EQd2NVelDe6ZVc2sO1CSpuSs+RHzY8c2n/kTNQAHw4um/eAXY+ZY4IKoUpNK0wO6C5hN+XcUXR7yqT8VbwwNIQ==

typescript@~4.6.2, typescript@~4.6.3:
version "4.6.4"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.6.4.tgz#caa78bbc3a59e6a5c510d35703f6a09877ce45e9"
integrity sha512-9ia/jWHIEbo49HfjrLGfKbZSuWo9iTMwXO+Ca3pRsSpbsMbc7/IU8NKdCZVRRBafVPGnoJeFL76ZOAA84I9fEg==

typescript@~4.7.2:
version "4.7.2"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.7.2.tgz#1f9aa2ceb9af87cca227813b4310fff0b51593c4"
integrity sha512-Mamb1iX2FDUpcTRzltPxgWMKy3fhg0TN378ylbktPGPK/99KbDtMQ4W1hwgsbPAsG3a0xKa1vmw4VKZQbkvz5A==

ua-parser-js@1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-1.0.2.tgz#e2976c34dbfb30b15d2c300b2a53eac87c57a775"
Expand Down