Skip to content

Commit 4738569

Browse files
atscottatscott
committed
refactor(language-service): Remove View Engine code from language service package (#44064)
This commit removes ViewEngine-specific code from the langauge service package. This code is no longer used since VE is not supported in v13+. PR Close #44064
1 parent 891318e commit 4738569

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+47
-11513
lines changed

‎goldens/circular-deps/packages.json‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -341,10 +341,6 @@
341341
"packages/forms/src/directives/validators.ts",
342342
"packages/forms/src/validators.ts"
343343
],
344-
[
345-
"packages/language-service/src/template.ts",
346-
"packages/language-service/src/typescript_host.ts"
347-
],
348344
[
349345
"packages/router/src/config.ts",
350346
"packages/router/src/router_state.ts"

‎packages/language-service/BUILD.bazel‎

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -15,36 +15,6 @@ ts_library(
1515
],
1616
)
1717

18-
ts_library(
19-
name = "language-service",
20-
srcs = glob(
21-
[
22-
"src/**/*.ts",
23-
],
24-
exclude = [
25-
"src/ts_utils.ts",
26-
],
27-
),
28-
deps = [
29-
":api",
30-
":ts_utils",
31-
"//packages:types",
32-
"//packages/compiler",
33-
"//packages/compiler-cli",
34-
"//packages/core",
35-
"@npm//@types/node",
36-
"@npm//typescript",
37-
],
38-
)
39-
40-
ts_library(
41-
name = "ts_utils",
42-
srcs = ["src/ts_utils.ts"],
43-
deps = [
44-
"@npm//typescript",
45-
],
46-
)
47-
4818
pkg_npm(
4919
name = "npm_package",
5020
srcs = ["package.json"],

‎packages/language-service/ivy/test/legacy/BUILD.bazel‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,15 @@ jasmine_node_test(
2424
"//packages/common",
2525
"//packages/core",
2626
"//packages/forms",
27-
"//packages/language-service/test:project",
27+
":project",
2828
],
2929
deps = [
3030
":legacy_lib",
3131
],
3232
)
33+
34+
filegroup(
35+
name = "project",
36+
srcs = glob(["project/**/*"]),
37+
visibility = ["//packages/language-service:__subpackages__"],
38+
)

‎packages/language-service/ivy/test/legacy/mock_host.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ const logger: ts.server.Logger = {
3232
};
3333

3434
export const TEST_SRCDIR = process.env.TEST_SRCDIR!;
35-
export const PROJECT_DIR =
36-
join(TEST_SRCDIR, 'angular', 'packages', 'language-service', 'test', 'project');
35+
export const PROJECT_DIR = join(
36+
TEST_SRCDIR, 'angular', 'packages', 'language-service', 'ivy', 'test', 'legacy', 'project');
3737
export const TSCONFIG = join(PROJECT_DIR, 'tsconfig.json');
3838
export const APP_COMPONENT = join(PROJECT_DIR, 'app', 'app.component.ts');
3939
export const APP_MAIN = join(PROJECT_DIR, 'app', 'main.ts');
@@ -141,7 +141,7 @@ function createHost(configFileFs: MockConfigFileFs): ts.server.ServerHost {
141141

142142
/**
143143
* Create a ConfiguredProject and an actual program for the test project located
144-
* in packages/language-service/test/project. Project creation exercises the
144+
* in packages/language-service/ivy/test/legacy/project. Project creation exercises the
145145
* actual code path, but a mock host is used for the filesystem to intercept
146146
* and modify test files.
147147
*/

‎packages/language-service/ivy/test/legacy/mock_host_spec.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ describe('mock host', () => {
3030
expect(project).toBeInstanceOf(ts.server.ConfiguredProject);
3131
const configPath = (project as ts.server.ConfiguredProject).getConfigFilePath();
3232
expect(configPath.substring(TEST_SRCDIR.length))
33-
.toBe('/angular/packages/language-service/test/project/tsconfig.json');
33+
.toBe('/angular/packages/language-service/ivy/test/legacy/project/tsconfig.json');
3434
const program = tsLS.getProgram();
3535
expect(program).toBeDefined();
3636
const sourceFiles = program!.getSourceFiles().map(sf => {
@@ -46,9 +46,9 @@ describe('mock host', () => {
4646
'/angular/packages/core/src/core.d.ts',
4747
'/angular/packages/forms/src/forms.d.ts',
4848
// This shows that project files are present
49-
'/angular/packages/language-service/test/project/app/app.component.ts',
50-
'/angular/packages/language-service/test/project/app/main.ts',
51-
'/angular/packages/language-service/test/project/app/parsing-cases.ts',
49+
'/angular/packages/language-service/ivy/test/legacy/project/app/app.component.ts',
50+
'/angular/packages/language-service/ivy/test/legacy/project/app/main.ts',
51+
'/angular/packages/language-service/ivy/test/legacy/project/app/parsing-cases.ts',
5252
]));
5353
});
5454

packages/language-service/test/project/app/#inner/component.ts renamed to packages/language-service/ivy/test/legacy/project/app/#inner/component.ts

File renamed without changes.

packages/language-service/test/project/app/#inner/inner.html renamed to packages/language-service/ivy/test/legacy/project/app/#inner/inner.html

File renamed without changes.

packages/language-service/test/project/app/app.component.ts renamed to packages/language-service/ivy/test/legacy/project/app/app.component.ts

File renamed without changes.

packages/language-service/test/project/app/main.ts renamed to packages/language-service/ivy/test/legacy/project/app/main.ts

File renamed without changes.

packages/language-service/test/project/app/parsing-cases.ts renamed to packages/language-service/ivy/test/legacy/project/app/parsing-cases.ts

File renamed without changes.

0 commit comments

Comments
 (0)