From 4e69e80501dd2a9394b7df4518e0d6b0f2ebb7d9 Mon Sep 17 00:00:00 2001 From: Alan Agius Date: Fri, 14 Oct 2022 12:11:41 +0000 Subject: [PATCH] fix(@schematics/angular): add `@angular/localize` as type when localize package is installed The `@angular/localize` entrypoint now exposes the global `$localize` method type. See: https://github.com/angular/angular/pull/47763 (cherry picked from commit b29ae2feda00b076f27a16bd61b2a5d951126b9b) --- .../build_angular/test/hello-world-app/src/tsconfig.app.json | 2 +- .../test/hello-world-app/src/tsconfig.server.json | 2 +- .../build_angular/test/hello-world-app/src/tsconfig.spec.json | 2 +- .../universal/files/root/tsconfig.server.json.template | 2 +- packages/schematics/angular/universal/index_spec.ts | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/angular_devkit/build_angular/test/hello-world-app/src/tsconfig.app.json b/packages/angular_devkit/build_angular/test/hello-world-app/src/tsconfig.app.json index 0fd75806850e..a76843b689fb 100644 --- a/packages/angular_devkit/build_angular/test/hello-world-app/src/tsconfig.app.json +++ b/packages/angular_devkit/build_angular/test/hello-world-app/src/tsconfig.app.json @@ -2,7 +2,7 @@ "extends": "../tsconfig.json", "compilerOptions": { "outDir": "../out-tsc/app", - "types": ["@angular/localize/init"] + "types": ["@angular/localize"] }, "files": [ "main.ts", diff --git a/packages/angular_devkit/build_angular/test/hello-world-app/src/tsconfig.server.json b/packages/angular_devkit/build_angular/test/hello-world-app/src/tsconfig.server.json index 9599811a5803..314d4221c240 100644 --- a/packages/angular_devkit/build_angular/test/hello-world-app/src/tsconfig.server.json +++ b/packages/angular_devkit/build_angular/test/hello-world-app/src/tsconfig.server.json @@ -4,7 +4,7 @@ "outDir": "../dist-server", "target": "es2016", "baseUrl": "./", - "types": ["@angular/localize/init"] + "types": ["@angular/localize"] }, "files": [ "main.server.ts" diff --git a/packages/angular_devkit/build_angular/test/hello-world-app/src/tsconfig.spec.json b/packages/angular_devkit/build_angular/test/hello-world-app/src/tsconfig.spec.json index 13749f5c0c0c..a42459f71db5 100644 --- a/packages/angular_devkit/build_angular/test/hello-world-app/src/tsconfig.spec.json +++ b/packages/angular_devkit/build_angular/test/hello-world-app/src/tsconfig.spec.json @@ -4,7 +4,7 @@ "outDir": "../out-tsc/spec", "types": [ "jasmine", - "@angular/localize/init" + "@angular/localize" ] }, "files": [ diff --git a/packages/schematics/angular/universal/files/root/tsconfig.server.json.template b/packages/schematics/angular/universal/files/root/tsconfig.server.json.template index 20751626f84d..e073793ceead 100644 --- a/packages/schematics/angular/universal/files/root/tsconfig.server.json.template +++ b/packages/schematics/angular/universal/files/root/tsconfig.server.json.template @@ -6,7 +6,7 @@ "target": "es2019", "types": [ "node"<% if (hasLocalizePackage) { %>, - "@angular/localize/init"<% } %> + "@angular/localize"<% } %> ] }, "files": [ diff --git a/packages/schematics/angular/universal/index_spec.ts b/packages/schematics/angular/universal/index_spec.ts index 31aaff944ede..9f276e011b5c 100644 --- a/packages/schematics/angular/universal/index_spec.ts +++ b/packages/schematics/angular/universal/index_spec.ts @@ -233,7 +233,7 @@ describe('Universal Schematic', () => { const { compilerOptions } = tree.readJson('/projects/bar/tsconfig.server.json') as { compilerOptions: CompilerOptions; }; - expect(compilerOptions.types).not.toContain('@angular/localize/init'); + expect(compilerOptions.types).not.toContain('@angular/localize'); }); it(`should add import to '@angular/localize' as type in 'tsconfig.server.json' when it's a dependency`, async () => { @@ -249,6 +249,6 @@ describe('Universal Schematic', () => { const { compilerOptions } = tree.readJson('/projects/bar/tsconfig.server.json') as { compilerOptions: CompilerOptions; }; - expect(compilerOptions.types).toContain('@angular/localize/init'); + expect(compilerOptions.types).toContain('@angular/localize'); }); });