Skip to content
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
4 changes: 2 additions & 2 deletions MODULE.bazel.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 0 additions & 8 deletions bazel/rules/rules_angular/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -1,11 +1,3 @@
load("@rules_angular_npm//:defs.bzl", "npm_link_all_packages")
load("//src/private:symlink_package.bzl", "symlink_package")

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

npm_link_all_packages()

symlink_package(
name = "node_modules/typescript",
src = "@rules_angular_configurable_deps//:typescript",
)
2 changes: 1 addition & 1 deletion bazel/rules/rules_angular/MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,6 @@ use_repo(npm, "rules_angular_npm")
rules_angular = use_extension("//setup:extensions.bzl", "rules_angular")
rules_angular.setup(
angular_compiler_cli = "//:node_modules/@angular/compiler-cli",
typescript = "//:node_modules/typescript-local",
typescript = "//:node_modules/typescript",
)
use_repo(rules_angular, "rules_angular_configurable_deps")
4 changes: 2 additions & 2 deletions bazel/rules/rules_angular/MODULE.bazel.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion bazel/rules/rules_angular/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
},
"dependencies": {
"@angular/compiler-cli": "22.0.0-next.3",
"typescript-local": "npm:typescript@5.9.3"
"typescript": "5.9.3"
},
"devDependencies": {
"@angular/build": "22.0.0-next.1",
Expand Down
6 changes: 3 additions & 3 deletions bazel/rules/rules_angular/pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 8 additions & 2 deletions bazel/rules/rules_angular/src/worker/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,17 @@ load("//src/private:symlink_package.bzl", "symlink_package")

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

# User configured dependencies
symlink_package(
name = "node_modules/@angular/compiler-cli",
src = "@rules_angular_configurable_deps//:angular_compiler_cli",
)

symlink_package(
name = "node_modules/typescript",
src = "@rules_angular_configurable_deps//:typescript",
)

# ---

copy_file(
Expand Down Expand Up @@ -40,13 +46,13 @@ ts_project(
declaration = True,
tsconfig = "tsconfig",
deps = [
"//:node_modules/typescript",
"//:node_modules/json-stable-stringify",
"//:node_modules/lru-cache",
"//:node_modules/memfs",
# NOTE: The Angular compiler in this target is not affecting any compilation
# output, but it's still necessary for some foundational utils like virtual FS.
"//:node_modules/@angular/compiler-cli", # compiler from npm.
"//:node_modules/typescript", # typescript from npm.
],
)

Expand All @@ -62,10 +68,10 @@ ts_project(
tsconfig = "tsconfig",
deps = [
":node_modules/@angular/compiler-cli", # user-configured compiler
":node_modules/typescript", # user-configured typescript
"//:node_modules/json-stable-stringify",
"//:node_modules/lru-cache",
"//:node_modules/memfs",
"//:node_modules/typescript",
],
)

Expand Down
4 changes: 2 additions & 2 deletions bazel/rules/rules_browsers/MODULE.bazel.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions bazel/rules/rules_browsers/test/MODULE.bazel.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions bazel/rules/rules_sass/MODULE.bazel.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 1 addition & 4 deletions ng-dev/misc/sync-module-bazel/cli.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,7 @@ async function handler() {
// Read package.json
const packageJson = JSON.parse(readFileSync(packageJsonPath, 'utf8')) as PackageJson;
const pnpmVersion = packageJson.engines?.pnpm;
const tsVersion =
packageJson.dependencies?.typescript ||
packageJson.devDependencies?.typescript ||
packageJson.dependencies?.['typescript-local']?.replace('npm:typescript@', '');
const tsVersion = packageJson.dependencies?.typescript || packageJson.devDependencies?.typescript;

// Read .nvmrc
let nvmrcVersion: string | undefined;
Expand Down
1 change: 0 additions & 1 deletion ng-dev/misc/sync-module-bazel/sync-module-bazel.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ export interface PackageJson {
};
dependencies?: {
typescript?: string;
'typescript-local'?: string;
};
devDependencies?: {
typescript?: string;
Expand Down
Loading