Skip to content

Commit

Permalink
refactor: move npm_translate_lock helper functions to npm/private/npm…
Browse files Browse the repository at this point in the history
…_translate_lock_helpers.bzl (#1315)
  • Loading branch information
gregmagolan authored Oct 14, 2023
1 parent 8c56f2f commit 6d72ff4
Show file tree
Hide file tree
Showing 8 changed files with 579 additions and 573 deletions.
4 changes: 2 additions & 2 deletions npm/extensions.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ See https://bazel.build/docs/bzlmod#extension-definition

load("//npm:repositories.bzl", "npm_import", "pnpm_repository", _LATEST_PNPM_VERSION = "LATEST_PNPM_VERSION")
load("//npm/private:npm_translate_lock.bzl", "npm_translate_lock", "npm_translate_lock_lib")
load("//npm/private:npm_translate_lock_generate.bzl", npm_translate_lock_helpers = "helpers")
load("//npm/private:npm_translate_lock_helpers.bzl", npm_translate_lock_helpers = "helpers")
load("//npm/private:npm_translate_lock_macro_helpers.bzl", macro_helpers = "helpers")
load("//npm/private:npm_import.bzl", "npm_import_lib", "npm_import_links_lib")
load("//npm/private:npmrc.bzl", "parse_npmrc")
Expand Down Expand Up @@ -78,7 +78,7 @@ def _extension_impl(module_ctx):
lifecycle_hooks_no_sandbox = attr.lifecycle_hooks_no_sandbox,
lifecycle_hooks_execution_requirements = attr.lifecycle_hooks_execution_requirements,
)
imports = npm_translate_lock_helpers.gen_npm_imports(
imports = npm_translate_lock_helpers.get_npm_imports(
importers = importers,
packages = packages,
patched_dependencies = lock_patched_dependencies,
Expand Down
6 changes: 3 additions & 3 deletions npm/private/npm_translate_lock.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ load("@bazel_skylib//lib:paths.bzl", "paths")
load("@aspect_bazel_lib//lib:repositories.bzl", _register_copy_directory_toolchains = "register_copy_directory_toolchains", _register_copy_to_directory_toolchains = "register_copy_to_directory_toolchains")
load("@aspect_bazel_lib//lib:write_source_files.bzl", "write_source_file")
load(":list_sources.bzl", "list_sources")
load(":npm_translate_lock_generate.bzl", gen_helpers = "helpers")
load(":npm_translate_lock_generate.bzl", "generate_repository_files")
load(":npm_translate_lock_helpers.bzl", "helpers")
load(":npm_translate_lock_macro_helpers.bzl", macro_helpers = "helpers")
load(":npm_translate_lock_state.bzl", "DEFAULT_ROOT_PACKAGE", "npm_translate_lock_state")
Expand Down Expand Up @@ -101,7 +101,7 @@ def _npm_translate_lock_impl(rctx):
# If the pnpm lock file was changed then reload it before translation
state.reload_lockfile()

gen_helpers.verify_node_modules_ignored(rctx, state.importers(), state.root_package())
helpers.verify_node_modules_ignored(rctx, state.importers(), state.root_package())

helpers.verify_patches(rctx, state)

Expand All @@ -117,7 +117,7 @@ def _npm_translate_lock_impl(rctx):

rctx.report_progress("Generating starlark for npm dependencies")

gen_helpers.generate_repository_files(
generate_repository_files(
rctx,
state.label_store.label("pnpm_lock"),
importers,
Expand Down
Loading

0 comments on commit 6d72ff4

Please sign in to comment.