Skip to content

Commit c8af5c0

Browse files
josephperrottdevversion
authored andcommitted
use symlinked version of typescript for all typescript dependencies
We prevent the angular-cli package from bringing in its own version of typescript and instead always rely on the version provided by the workspace setup rules.
1 parent 443da49 commit c8af5c0

6 files changed

Lines changed: 35 additions & 23 deletions

File tree

.pnpmfile.cjs

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
function readPackage(pkg, context) {
2+
if (pkg.name === '@angular/compiler-cli') {
3+
// Remove typescript from peer dependencies to allow it to be provided
4+
// via the symlinked version.
5+
delete pkg.peerDependencies['typescript'];
6+
delete pkg.peerDependenciesMeta['typescript'];
7+
}
8+
return pkg;
9+
}
10+
11+
module.exports = {
12+
hooks: {
13+
readPackage,
14+
},
15+
};

BUILD.bazel

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
load("@rules_angular_npm//:defs.bzl", "npm_link_all_packages")
2+
load("//src/private:symlink_package.bzl", "symlink_package")
23

34
package(default_visibility = ["//visibility:public"])
45

56
npm_link_all_packages()
7+
8+
symlink_package(
9+
name = "node_modules/typescript",
10+
src = "@rules_angular_configurable_deps//:typescript",
11+
)

WORKSPACE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ load("//setup:step_3.bzl", "rules_angular_step3")
2929

3030
rules_angular_step3(
3131
angular_compiler_cli = "//:node_modules/@angular/compiler-cli",
32-
typescript = "//:node_modules/typescript",
32+
typescript = "//:node_modules/typescript-local",
3333
)
3434

3535
http_archive(

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
"rxjs": "^7.8.2",
3636
"tinyglobby": "0.2.12",
3737
"tslib": "^2.8.1",
38-
"typescript": "5.9.2",
38+
"typescript-local": "npm:typescript@5.9.2",
3939
"zone.js": "^0.15.0"
4040
},
4141
"dependencies": {

pnpm-lock.yaml

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

src/worker/BUILD.bazel

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,6 @@ load("//src/private:symlink_package.bzl", "symlink_package")
55

66
package(default_visibility = ["//visibility:public"])
77

8-
symlink_package(
9-
name = "node_modules/typescript",
10-
src = "@rules_angular_configurable_deps//:typescript",
11-
)
12-
138
symlink_package(
149
name = "node_modules/@angular/compiler-cli",
1510
src = "@rules_angular_configurable_deps//:angular_compiler_cli",
@@ -45,7 +40,7 @@ ts_project(
4540
declaration = True,
4641
tsconfig = "tsconfig",
4742
deps = [
48-
":node_modules/typescript",
43+
"//:node_modules/typescript",
4944
"//:node_modules/json-stable-stringify",
5045
"//:node_modules/lru-cache",
5146
"//:node_modules/memfs",
@@ -67,7 +62,7 @@ ts_project(
6762
tsconfig = "tsconfig",
6863
deps = [
6964
":node_modules/@angular/compiler-cli", # user-configured compiler
70-
":node_modules/typescript",
65+
"//:node_modules/typescript",
7166
"//:node_modules/json-stable-stringify",
7267
"//:node_modules/lru-cache",
7368
"//:node_modules/memfs",

0 commit comments

Comments
 (0)