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
42 changes: 42 additions & 0 deletions .pnpmfile.cjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
const localPackages = new Set([
'@angular-devkit/build-angular',
'@angular-devkit/build-webpack',
'@ngtools/webpack',
]);

const peerDependenciesToTransform = ['webpack', 'webpack-dev-server', 'browser-sync'];

function readPackage(pkg, context) {
// TODO(devversion): This allows us to make the peer dependencies of (e.g. webpack) a production dependency.
// because `rules_js` doesn't otherwise include the dependency in the `npm_package_store`.
// See: https://github.com/aspect-build/rules_js/issues/2226
if (!pkg.peerDependencies || !localPackages.has(pkg.name)) {
return pkg;
}

for (const key of peerDependenciesToTransform) {
// Any package that has a peerDependency on these deps, should instead treat the peerDependency as a
// regular dependency.
if (!pkg.peerDependencies[key]) {
continue;
}

if (!pkg.devDependencies?.[key]) {
throw new Error(
`${key} is listed as a peerDependency in ${pkg.name}, but it is not listed in devDependencies. This is required.`,
);
}

pkg.dependencies ??= {};
pkg.dependencies[key] = pkg.devDependencies[key];
pkg.devDependencies[key] = undefined;
}

return pkg;
}

module.exports = {
hooks: {
readPackage,
},
};
5 changes: 3 additions & 2 deletions MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ module(

bazel_dep(name = "yq.bzl", version = "0.3.1")
bazel_dep(name = "rules_nodejs", version = "6.6.0")
bazel_dep(name = "aspect_rules_js", version = "2.8.0")
bazel_dep(name = "aspect_rules_js", version = "2.8.1")
bazel_dep(name = "aspect_rules_ts", version = "3.7.1")
bazel_dep(name = "rules_pkg", version = "0.8.1")

Expand All @@ -26,7 +26,7 @@ bazel_dep(name = "aspect_rules_jasmine", version = "2.0.0")
bazel_dep(name = "rules_angular")
git_override(
module_name = "rules_angular",
commit = "f56849353ab74c3f5ede0efa7d0bf7266fddddcb",
commit = "74d8baec22a5ffd3a1a36bac252399fa125a6c4b",
remote = "https://github.com/devversion/rules_angular.git",
)

Expand Down Expand Up @@ -115,6 +115,7 @@ npm.npm_translate_lock(
"webdriver-manager": "node ./bin/webdriver-manager update --standalone false --gecko false --versions.chrome 106.0.5249.21",
},
data = [
"//:.pnpmfile.cjs",
"//:package.json",
"//:pnpm-workspace.yaml",
"//modules/testing/builder:package.json",
Expand Down
45 changes: 34 additions & 11 deletions MODULE.bazel.lock

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

1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,6 @@
}
},
"resolutions": {
"typescript": "5.9.3",
"undici-types": "^7.16.0"
}
}
Loading