Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "fix: expand make variables properly when passed via args (#140)" #144

Merged
merged 1 commit into from
Mar 22, 2024
Merged

Revert "fix: expand make variables properly when passed via args (#140)" #144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 0 additions & 11 deletions e2e/smoke/src/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,10 @@ webpack_bundle(
node_modules = "//v5:node_modules",
)

# Validates that args are properly expanded when
# a format string is passed
entryPointFile = 'entry-point.js'
webpack_bundle(
name = "bundle-entry-args-v5",
args = ['--entry', '$(rootpath {})'.format(entryPointFile)],
srcs = ["entry-point.js"],
node_modules = "//v5:node_modules",
)

write_source_files(
name = "bundles",
files = {
"expected-v4.js_": ":bundle-v4.js",
"expected-v5.js_": ":bundle-v5.js",
"expected-v5.js_": ":bundle-entry-args-v5.js",
},
)
3 changes: 0 additions & 3 deletions e2e/smoke/src/entry-point.js
View file
Open in desktop

This file was deleted.

8 changes: 1 addition & 7 deletions webpack/private/webpack_bundle.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,13 +121,7 @@ def _impl(ctx):
])

# Add user specified arguments after rule supplied arguments
args.add_all([
" ".join([
expand_variables(ctx, exp, attribute_name = "args")
for exp in expand_locations(ctx, arg, entry_points_srcs + ctx.attr.srcs + ctx.attr.deps + ctx.attr.data).split(" ")
])
for arg in ctx.attr.args
])
args.add_all(ctx.attr.args)

executable = ctx.executable.webpack_exec_cfg
execution_requirements = {}
Expand Down
Loading