Skip to content

Commit

Permalink
chore: update aspect.dev URL references to aspect.build (#1747)
Browse files Browse the repository at this point in the history
  • Loading branch information
gregmagolan committed May 20, 2024
1 parent d0ff155 commit 2331093
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 12 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ This ruleset is a high-performance and npm-compatible Bazel integration for Java

Many companies are successfully building with rules_js. If you're getting value from the project, please let us know! Just comment on our [Adoption Discussion](https://github.com/aspect-build/rules_js/discussions/1000).

<https://blog.aspect.dev/rulesjs-npm-benchmarks> shows benchmarks for fetching, installing, and linking packages under rules_js as well as typical alternatives like npm and yarn.
<https://blog.aspect.build/rulesjs-npm-benchmarks> shows benchmarks for fetching, installing, and linking packages under rules_js as well as typical alternatives like npm and yarn.

Google does not fund development of rules_js. If your company benefits, please consider donating to continue development and maintenance work: <https://opencollective.com/aspect-build/projects/rules_js>

rules_js is just a part of what Aspect provides:

- _Need help?_
- Community support is available on the #javascript channel on [Bazel Slack](https://slack.bazel.build/)
- This ruleset has commercial support provided by https://aspect.dev.
- This ruleset has commercial support provided by https://aspect.build/services.
- See our other Bazel rules, especially those built for rules_js:
- [rules_ts](https://github.com/aspect-build/rules_ts) - Bazel rules for [TypeScript](http://typescriptlang.org)
- [rules_swc](https://github.com/aspect-build/rules_swc) - Bazel rules for [swc](https://swc.rs)
Expand Down
6 changes: 3 additions & 3 deletions docs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Stuck?
- See the [Frequently asked questions](./faq.md)
- Ask in `#javascript` on <http://slack.bazel.build>
- Check for [known issues](https://github.com/aspect-build/rules_js/issues)
- Pay for support, provided by <https://aspect.dev>.
- Pay for support, provided by <https://aspect.build/services>.

## Installation

Expand All @@ -33,7 +33,7 @@ Authoring BUILD files by hand is a chore, so we recommend using the

Other recommendations:

- Put [common flags](https://blog.aspect.dev/bazelrc-flags) in your `.bazelrc` file.
- Put [common flags](https://blog.aspect.build/bazelrc-flags) in your `.bazelrc` file.
- Use [Renovate](https://docs.renovatebot.com/) to keep your Bazel dependencies up-to-date.

### Node.js
Expand Down Expand Up @@ -93,7 +93,7 @@ Technically, we run a port of pnpm rather than pnpm itself. Here are some design
1. We re-use pnpm's resolver, by consuming the `pnpm-lock.yaml` file it produces.
1. We use Bazel's downloader API to fetch package tarballs and extract them to external repositories.
To modify the URLs Bazel uses to download packages (for example, to fetch from Artifactory), read
<https://blog.aspect.dev/configuring-bazels-downloader>.
<https://blog.aspect.build/configuring-bazels-downloader>.
1. We re-use the [`@pnpm/lifecycle`](https://www.npmjs.com/package/@pnpm/lifecycle) package to perform postinstall steps.
(These run as cacheable Bazel actions.)
1. Finally, you link the `node_modules` tree by adding a `npm_link_package` or `npm_link_all_packages` in your `BUILD` file,
Expand Down
4 changes: 2 additions & 2 deletions docs/npm_import.md

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

2 changes: 1 addition & 1 deletion docs/npm_translate_lock.md

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

4 changes: 3 additions & 1 deletion docs/pnpm.md
Original file line number Diff line number Diff line change
Expand Up @@ -175,15 +175,17 @@ frequent lockfile or `package.json` changes. As a generated file manual resoluti
is unnecessary as it should only be generated and updated by `npm_translate_lock`.
To reduce the impact on developer workflows `git` can be configured to ignore merge conflicts using
`.gitattributes` and a [custom merge driver](https://git-scm.com/docs/gitattributes#_defining_a_custom_merge_driver).
See our [blog post](https://blog.aspect.dev/easier-merges-on-lockfiles) for a longer explanation.
See our [blog post](https://blog.aspect.build/easier-merges-on-lockfiles) for a longer explanation.

First, mark the `npm_translate_lock_<hash>` file (with `<hash>` replaced with the hash generated in your workspace)
to use a custom custom merge driver, in this example named `ours`:

```
.aspect/rules/external_repository_action_cache/npm_translate_lock_<hash>= merge=ours
```

Second, developers must define the `ours` custom merge driver in their git configuration to always accept local change:

```
git config --global merge.ours.driver true
```
Expand Down
4 changes: 2 additions & 2 deletions npm/private/npm_import.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ load("@aspect_rules_js//npm:repositories.bzl", "npm_import")
This uses Bazel's downloader to fetch the packages.
You can use this to redirect all fetches through a store like Artifactory.
See &lt;https://blog.aspect.dev/configuring-bazels-downloader&gt; for more info about how it works
See &lt;https://blog.aspect.build/configuring-bazels-downloader&gt; for more info about how it works
and how to configure it.
See [`npm_translate_lock`](#npm_translate_lock) for the primary user-facing API to fetch npm packages
Expand Down Expand Up @@ -1017,7 +1017,7 @@ def npm_import(
1. Point bazel to the config with a line in .bazelrc like
common --experimental_downloader_config=.bazel_downloader_config
Read more about the downloader config: <https://blog.aspect.dev/configuring-bazels-downloader>
Read more about the downloader config: <https://blog.aspect.build/configuring-bazels-downloader>
[UrlRewriterConfig]: https://github.com/bazelbuild/bazel/blob/4.2.1/src/main/java/com/google/devtools/build/lib/bazel/repository/downloader/UrlRewriterConfig.java#L66
Expand Down
2 changes: 1 addition & 1 deletion npm/private/npm_translate_lock.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ load("@aspect_rules_js//npm:repositories.bzl", "npm_translate_lock")
These use Bazel's downloader to fetch the packages.
You can use this to redirect all fetches through a store like Artifactory.
See <https://blog.aspect.dev/configuring-bazels-downloader> for more info about how it works
See <https://blog.aspect.build/configuring-bazels-downloader> for more info about how it works
and how to configure it.
[`npm_translate_lock`](#npm_translate_lock) is the primary user-facing API.
Expand Down

0 comments on commit 2331093

Please sign in to comment.