diff --git a/WORKSPACE b/WORKSPACE index 50e13a223..3a0fdf20f 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -257,3 +257,7 @@ llvm_toolchain( load("@llvm_toolchain//:toolchains.bzl", "llvm_register_toolchains") llvm_register_toolchains() + +load("@aspect_bazel_lib//lib:repositories.bzl", "register_expand_template_toolchains") + +register_expand_template_toolchains() diff --git a/docs/js_image_layer.md b/docs/js_image_layer.md index 4f5bb19e3..b1933c94e 100644 --- a/docs/js_image_layer.md +++ b/docs/js_image_layer.md @@ -42,7 +42,7 @@ load("@aspect_rules_js//js:defs.bzl", "js_binary", "js_image_layer") load("@rules_oci//oci:defs.bzl", "oci_image") js_binary( - name = "binary", + name = "main", entry_point = "main.js", ) @@ -56,14 +56,14 @@ platform( js_image_layer( name = "layers", - binary = ":binary", + binary = ":main", platform = ":amd64_linux", root = "/app" ) oci_image( name = "image", - cmd = ["/app/main"], + cmd = ["/app/main_/main"], entrypoint = ["bash"], tars = [ ":layers" @@ -79,7 +79,7 @@ load("@aspect_rules_js//js:defs.bzl", "js_binary", "js_image_layer") load("@rules_oci//oci:defs.bzl", "oci_image", "oci_image_index") js_binary( - name = "binary", + name = "main", entry_point = "main.js", ) @@ -93,13 +93,13 @@ js_binary( ) js_image_layer( name = "{}_layers".format(arch), - binary = ":binary", + binary = ":main", platform = ":linux_{arch}", root = "/app" ) oci_image( name = "{}_image".format(arch), - cmd = ["/app/main"], + cmd = ["/app/main_/main"], entrypoint = ["bash"], tars = [ ":{}_layers".format(arch) @@ -164,7 +164,7 @@ container_layer( container_image( name = "image", - cmd = ["/app/main"], + cmd = ["/app/main_/main"], entrypoint = ["bash"], layers = [ ":app_layer", diff --git a/e2e/js_image_docker/BUILD.bazel b/e2e/js_image_docker/BUILD.bazel index 7b2b08e2d..06010c725 100644 --- a/e2e/js_image_docker/BUILD.bazel +++ b/e2e/js_image_docker/BUILD.bazel @@ -73,8 +73,8 @@ container_image( # Since js_binary depends on bash we have to bring in a base image that has bash base = "@debian_amd64//image", # or "@debian_arm64//image", if you are on an arm machine - # This is going to be /{root of js_image_layer}/{package_name()}/{name of js_binary} - cmd = ["/app/main"], + # This is going to be /{root of js_image_layer}/{package_name()}/{name of js_binary}_/{name of js_binary} + cmd = ["/app/main_/main"], entrypoint = ["bash"], layers = [ ":app_layer", diff --git a/e2e/js_image_docker/smoketest.yaml b/e2e/js_image_docker/smoketest.yaml index a67eddcbf..4ccc153ca 100644 --- a/e2e/js_image_docker/smoketest.yaml +++ b/e2e/js_image_docker/smoketest.yaml @@ -3,8 +3,8 @@ schemaVersion: 2.0.0 commandTests: - name: 'smoke' command: 'bash' - args: ['/app/main'] + args: ['/app/main_/main'] expectedOutput: ['.*WORKSPACE.*__main__', '.*main.*', '.*ARCH.*'] - name: 'smoke2' - command: '/app/main' + command: '/app/main_/main' expectedOutput: ['.*WORKSPACE.*__main__', '.*main.*', '.*ARCH.*'] diff --git a/e2e/js_image_oci/src/BUILD.bazel b/e2e/js_image_oci/src/BUILD.bazel index b03f5e4e5..3a435dfa4 100644 --- a/e2e/js_image_oci/src/BUILD.bazel +++ b/e2e/js_image_oci/src/BUILD.bazel @@ -55,8 +55,8 @@ oci_image( name = "image", # Since js_binary depends on bash we have to bring in a base image that has bash base = "@debian", - # This is going to be /{root of js_image_layer}/{package_name()}/{name of js_binary} - cmd = ["/app/src/main"], + # This is going to be /{root of js_image_layer}/{package_name()}/{name of js_binary}_/{name of js_binary} + cmd = ["/app/src/main_/main"], entrypoint = ["bash"], tars = [ ":layers", diff --git a/e2e/js_image_oci/src/test.yaml b/e2e/js_image_oci/src/test.yaml index 46b3f2d39..02b4fef10 100644 --- a/e2e/js_image_oci/src/test.yaml +++ b/e2e/js_image_oci/src/test.yaml @@ -3,7 +3,7 @@ schemaVersion: 2.0.0 commandTests: - name: 'smoke' command: 'bash' - args: ['/app/src/main'] + args: ['/app/src/main_/main'] expectedOutput: [ 'OS', @@ -16,7 +16,7 @@ commandTests: ' SOURCE DIRECTORY CHECK true', ] - name: 'smoke2' - command: '/app/src/main' + command: '/app/src/main_/main' expectedOutput: [ 'OS', diff --git a/e2e/worker/BUILD.bazel b/e2e/worker/BUILD.bazel index 53f737f1d..9f1f36dab 100644 --- a/e2e/worker/BUILD.bazel +++ b/e2e/worker/BUILD.bazel @@ -16,7 +16,7 @@ copy_file( ) js_binary( - name = "worker_binary", + name = "worker", data = [":copy_worker_js"], entry_point = ":copy_dummy_worker", visibility = ["//visibility:public"], diff --git a/e2e/worker/defs.bzl b/e2e/worker/defs.bzl index 25279dc08..99072726b 100644 --- a/e2e/worker/defs.bzl +++ b/e2e/worker/defs.bzl @@ -31,7 +31,7 @@ pi_rule = rule( "worker": attr.label( executable = True, cfg = "exec", - default = ":worker_binary", + default = ":worker", ), }, ) diff --git a/examples/coverage/BUILD.bazel b/examples/coverage/BUILD.bazel index bb7f37318..f55f4319f 100644 --- a/examples/coverage/BUILD.bazel +++ b/examples/coverage/BUILD.bazel @@ -1,7 +1,7 @@ load("@aspect_rules_js//js:defs.bzl", "js_test") js_test( - name = "coverage_test", + name = "coverage", data = [ "coverage.js", "//:node_modules/@types/node", diff --git a/examples/js_binary/BUILD.bazel b/examples/js_binary/BUILD.bazel index ae782d31a..980bbf50a 100644 --- a/examples/js_binary/BUILD.bazel +++ b/examples/js_binary/BUILD.bazel @@ -7,6 +7,7 @@ Simple examples of running JS programs in node with js_binary, js_run_binary, an load("@aspect_bazel_lib//lib:copy_to_bin.bzl", "copy_to_bin") load("@aspect_bazel_lib//lib:diff_test.bzl", "diff_test") load("@aspect_bazel_lib//lib:directory_path.bzl", "directory_path") +load("@aspect_bazel_lib//lib:expand_template.bzl", "expand_template") load("@aspect_rules_js//js:defs.bzl", "js_binary", "js_run_binary", "js_test") load("@bazel_skylib//rules:write_file.bzl", "write_file") load("@npm//:defs.bzl", "npm_link_all_packages") @@ -457,21 +458,26 @@ js_binary( entry_point = "case10.js", ) -write_file( +expand_template( name = "write10_launch_sh", out = "launch_case10.sh", - content = ["""\ - # --- begin runfiles.bash initialization v2 --- - set -uo pipefail; f=bazel_tools/tools/bash/runfiles/runfiles.bash - source "${RUNFILES_DIR:-/dev/null}/$f" 2>/dev/null || \ - source "$(grep -sm1 "^$f " "${RUNFILES_MANIFEST_FILE:-/dev/null}" | cut -f2- -d' ')" 2>/dev/null || \ - source "$0.runfiles/$f" 2>/dev/null || \ - source "$(grep -sm1 "^$f " "$0.runfiles_manifest" | cut -f2- -d' ')" 2>/dev/null || \ - source "$(grep -sm1 "^$f " "$0.exe.runfiles_manifest" | cut -f2- -d' ')" 2>/dev/null || \ - { echo>&2 "ERROR: cannot find $f"; exit 1; }; f=; set -e - # --- end runfiles.bash initialization v2 --- - - $(rlocation aspect_rules_js/examples/js_binary/bin10-js_binary) "$@" + data = [":bin10-js_binary"], + is_executable = True, + substitutions = { + "{rlocationpath}": "$(rlocationpath :bin10-js_binary)", + }, + template = ["""\ +# --- begin runfiles.bash initialization v2 --- +set -uo pipefail; f=bazel_tools/tools/bash/runfiles/runfiles.bash +source "${RUNFILES_DIR:-/dev/null}/$f" 2>/dev/null || \ +source "$(grep -sm1 "^$f " "${RUNFILES_MANIFEST_FILE:-/dev/null}" | cut -f2- -d' ')" 2>/dev/null || \ +source "$0.runfiles/$f" 2>/dev/null || \ +source "$(grep -sm1 "^$f " "$0.runfiles_manifest" | cut -f2- -d' ')" 2>/dev/null || \ +source "$(grep -sm1 "^$f " "$0.exe.runfiles_manifest" | cut -f2- -d' ')" 2>/dev/null || \ +{ echo>&2 "ERROR: cannot find $f"; exit 1; }; f=; set -e +# --- end runfiles.bash initialization v2 --- + +$(rlocation {rlocationpath}) "$@" """], ) diff --git a/js/private/coverage/merger.bzl b/js/private/coverage/merger.bzl index 4d4d3c081..e84ec2641 100644 --- a/js/private/coverage/merger.bzl +++ b/js/private/coverage/merger.bzl @@ -32,7 +32,7 @@ def _coverage_merger_impl(ctx): node_path = _deprecated_target_tool_path_to_short_path(nodeinfo.target_tool_path) # Create launcher - bash_launcher = ctx.actions.declare_file(ctx.label.name) + bash_launcher = ctx.actions.declare_file("{}_/{}".format(ctx.label.name, ctx.label.name)) ctx.actions.expand_template( template = ctx.file._launcher_template, output = bash_launcher, diff --git a/js/private/js_binary.bzl b/js/private/js_binary.bzl index 561954559..a7f19e2f6 100644 --- a/js/private/js_binary.bzl +++ b/js/private/js_binary.bzl @@ -467,7 +467,7 @@ def _bash_launcher(ctx, nodeinfo, entry_point_path, log_prefix_rule_set, log_pre "{{workspace_name}}": ctx.workspace_name, } - launcher = ctx.actions.declare_file(ctx.label.name) + launcher = ctx.actions.declare_file("{}_/{}".format(ctx.label.name, ctx.label.name)) ctx.actions.expand_template( template = ctx.file._launcher_template, output = launcher, diff --git a/js/private/js_image_layer.bzl b/js/private/js_image_layer.bzl index a1c4fc7cb..2c5d8f67c 100644 --- a/js/private/js_image_layer.bzl +++ b/js/private/js_image_layer.bzl @@ -36,7 +36,7 @@ load("@aspect_rules_js//js:defs.bzl", "js_binary", "js_image_layer") load("@rules_oci//oci:defs.bzl", "oci_image") js_binary( - name = "binary", + name = "main", entry_point = "main.js", ) @@ -50,14 +50,14 @@ platform( js_image_layer( name = "layers", - binary = ":binary", + binary = ":main", platform = ":amd64_linux", root = "/app" ) oci_image( name = "image", - cmd = ["/app/main"], + cmd = ["/app/main_/main"], entrypoint = ["bash"], tars = [ ":layers" @@ -73,7 +73,7 @@ load("@aspect_rules_js//js:defs.bzl", "js_binary", "js_image_layer") load("@rules_oci//oci:defs.bzl", "oci_image", "oci_image_index") js_binary( - name = "binary", + name = "main", entry_point = "main.js", ) @@ -87,13 +87,13 @@ js_binary( ) js_image_layer( name = "{}_layers".format(arch), - binary = ":binary", + binary = ":main", platform = ":linux_{arch}", root = "/app" ) oci_image( name = "{}_image".format(arch), - cmd = ["/app/main"], + cmd = ["/app/main_/main"], entrypoint = ["bash"], tars = [ ":{}_layers".format(arch) @@ -158,7 +158,7 @@ container_layer( container_image( name = "image", - cmd = ["/app/main"], + cmd = ["/app/main_/main"], entrypoint = ["bash"], layers = [ ":app_layer", diff --git a/js/private/test/image/checksum.expected b/js/private/test/image/checksum.expected index 47fc5b9a4..139d081b3 100644 --- a/js/private/test/image/checksum.expected +++ b/js/private/test/image/checksum.expected @@ -1,2 +1,2 @@ -e6a04b6344eb21154508bf246ebead12d436313739c478978cd5763262491f98 js/private/test/image/cksum_app.tar -7990126e5961588efd2af7cdccac3846dfffb8ca2e26206840df8c7a1c34c42e js/private/test/image/cksum_node_modules.tar +99bc84e3bee778a70b7ad1e25d719d50c9e1d8e4b4dfab3c5335156b2889e185 js/private/test/image/cksum_app.tar +f9388e94b2055de4a94548d65c2ec5390744abdada53678ab59c8a3410843f5e js/private/test/image/cksum_node_modules.tar diff --git a/js/private/test/image/custom_owner_app.listing b/js/private/test/image/custom_owner_app.listing index e239a9a91..a1f3bdc05 100644 --- a/js/private/test/image/custom_owner_app.listing +++ b/js/private/test/image/custom_owner_app.listing @@ -3,14 +3,16 @@ drwxr-xr-x 100/0 0 1970-01-01 00:00 app/js drwxr-xr-x 100/0 0 1970-01-01 00:00 app/js/private drwxr-xr-x 100/0 0 1970-01-01 00:00 app/js/private/test drwxr-xr-x 100/0 0 1970-01-01 00:00 app/js/private/test/image --r-xr-xr-x 100/0 131 1970-01-01 00:00 app/js/private/test/image/bin -drwxr-xr-x 100/0 0 1970-01-01 00:00 app/js/private/test/image/bin.runfiles -drwxr-xr-x 100/0 0 1970-01-01 00:00 app/js/private/test/image/bin.runfiles/aspect_rules_js -drwxr-xr-x 100/0 0 1970-01-01 00:00 app/js/private/test/image/bin.runfiles/aspect_rules_js/js -drwxr-xr-x 100/0 0 1970-01-01 00:00 app/js/private/test/image/bin.runfiles/aspect_rules_js/js/private -drwxr-xr-x 100/0 0 1970-01-01 00:00 app/js/private/test/image/bin.runfiles/aspect_rules_js/js/private/test -drwxr-xr-x 100/0 0 1970-01-01 00:00 app/js/private/test/image/bin.runfiles/aspect_rules_js/js/private/test/image --r-xr-xr-x 100/0 23908 1970-01-01 00:00 app/js/private/test/image/bin.runfiles/aspect_rules_js/js/private/test/image/bin -drwxr-xr-x 100/0 0 1970-01-01 00:00 app/js/private/test/image/bin.runfiles/aspect_rules_js/js/private/test/image/bin_node_bin --r-xr-xr-x 100/0 133 1970-01-01 00:00 app/js/private/test/image/bin.runfiles/aspect_rules_js/js/private/test/image/bin_node_bin/node --r-xr-xr-x 100/0 20 1970-01-01 00:00 app/js/private/test/image/bin.runfiles/aspect_rules_js/js/private/test/image/main.js +drwxr-xr-x 100/0 0 1970-01-01 00:00 app/js/private/test/image/bin_ +-r-xr-xr-x 100/0 141 1970-01-01 00:00 app/js/private/test/image/bin_/bin +drwxr-xr-x 100/0 0 1970-01-01 00:00 app/js/private/test/image/bin_/bin.runfiles +drwxr-xr-x 100/0 0 1970-01-01 00:00 app/js/private/test/image/bin_/bin.runfiles/aspect_rules_js +drwxr-xr-x 100/0 0 1970-01-01 00:00 app/js/private/test/image/bin_/bin.runfiles/aspect_rules_js/js +drwxr-xr-x 100/0 0 1970-01-01 00:00 app/js/private/test/image/bin_/bin.runfiles/aspect_rules_js/js/private +drwxr-xr-x 100/0 0 1970-01-01 00:00 app/js/private/test/image/bin_/bin.runfiles/aspect_rules_js/js/private/test +drwxr-xr-x 100/0 0 1970-01-01 00:00 app/js/private/test/image/bin_/bin.runfiles/aspect_rules_js/js/private/test/image +drwxr-xr-x 100/0 0 1970-01-01 00:00 app/js/private/test/image/bin_/bin.runfiles/aspect_rules_js/js/private/test/image/bin_ +-r-xr-xr-x 100/0 23908 1970-01-01 00:00 app/js/private/test/image/bin_/bin.runfiles/aspect_rules_js/js/private/test/image/bin_/bin +drwxr-xr-x 100/0 0 1970-01-01 00:00 app/js/private/test/image/bin_/bin.runfiles/aspect_rules_js/js/private/test/image/bin_node_bin +-r-xr-xr-x 100/0 133 1970-01-01 00:00 app/js/private/test/image/bin_/bin.runfiles/aspect_rules_js/js/private/test/image/bin_node_bin/node +-r-xr-xr-x 100/0 20 1970-01-01 00:00 app/js/private/test/image/bin_/bin.runfiles/aspect_rules_js/js/private/test/image/main.js diff --git a/js/private/test/image/custom_owner_node_modules.listing b/js/private/test/image/custom_owner_node_modules.listing index 3705ddd6a..40cea1419 100644 --- a/js/private/test/image/custom_owner_node_modules.listing +++ b/js/private/test/image/custom_owner_node_modules.listing @@ -3,36 +3,37 @@ drwxr-xr-x 100/0 0 1970-01-01 00:00 app/js drwxr-xr-x 100/0 0 1970-01-01 00:00 app/js/private drwxr-xr-x 100/0 0 1970-01-01 00:00 app/js/private/test drwxr-xr-x 100/0 0 1970-01-01 00:00 app/js/private/test/image -drwxr-xr-x 100/0 0 1970-01-01 00:00 app/js/private/test/image/bin.runfiles -drwxr-xr-x 100/0 0 1970-01-01 00:00 app/js/private/test/image/bin.runfiles/aspect_rules_js -drwxr-xr-x 100/0 0 1970-01-01 00:00 app/js/private/test/image/bin.runfiles/aspect_rules_js/js -drwxr-xr-x 100/0 0 1970-01-01 00:00 app/js/private/test/image/bin.runfiles/aspect_rules_js/js/private -drwxr-xr-x 100/0 0 1970-01-01 00:00 app/js/private/test/image/bin.runfiles/aspect_rules_js/js/private/node-patches --r-xr-xr-x 100/0 32555 1970-01-01 00:00 app/js/private/test/image/bin.runfiles/aspect_rules_js/js/private/node-patches/fs.js --r-xr-xr-x 100/0 1698 1970-01-01 00:00 app/js/private/test/image/bin.runfiles/aspect_rules_js/js/private/node-patches/register.js -drwxr-xr-x 100/0 0 1970-01-01 00:00 app/js/private/test/image/bin.runfiles/aspect_rules_js/js/private/test -drwxr-xr-x 100/0 0 1970-01-01 00:00 app/js/private/test/image/bin.runfiles/aspect_rules_js/js/private/test/image -drwxr-xr-x 100/0 0 1970-01-01 00:00 app/js/private/test/image/bin.runfiles/aspect_rules_js/js/private/test/image/node_modules -lrwxrwxr-x 100/0 0 1970-01-01 00:00 app/js/private/test/image/bin.runfiles/aspect_rules_js/js/private/test/image/node_modules/acorn -> ../../../../../node_modules/.aspect_rules_js/acorn@8.8.2/node_modules/acorn -drwxr-xr-x 100/0 0 1970-01-01 00:00 app/js/private/test/image/bin.runfiles/aspect_rules_js/node_modules -drwxr-xr-x 100/0 0 1970-01-01 00:00 app/js/private/test/image/bin.runfiles/aspect_rules_js/node_modules/.aspect_rules_js -drwxr-xr-x 100/0 0 1970-01-01 00:00 app/js/private/test/image/bin.runfiles/aspect_rules_js/node_modules/.aspect_rules_js/acorn@8.8.2 -drwxr-xr-x 100/0 0 1970-01-01 00:00 app/js/private/test/image/bin.runfiles/aspect_rules_js/node_modules/.aspect_rules_js/acorn@8.8.2/node_modules -drwxr-xr-x 100/0 0 1970-01-01 00:00 app/js/private/test/image/bin.runfiles/aspect_rules_js/node_modules/.aspect_rules_js/acorn@8.8.2/node_modules/acorn --r-xr-xr-x 100/0 19838 1970-01-01 00:00 app/js/private/test/image/bin.runfiles/aspect_rules_js/node_modules/.aspect_rules_js/acorn@8.8.2/node_modules/acorn/CHANGELOG.md --r-xr-xr-x 100/0 1099 1970-01-01 00:00 app/js/private/test/image/bin.runfiles/aspect_rules_js/node_modules/.aspect_rules_js/acorn@8.8.2/node_modules/acorn/LICENSE --r-xr-xr-x 100/0 10364 1970-01-01 00:00 app/js/private/test/image/bin.runfiles/aspect_rules_js/node_modules/.aspect_rules_js/acorn@8.8.2/node_modules/acorn/README.md -drwxr-xr-x 100/0 0 1970-01-01 00:00 app/js/private/test/image/bin.runfiles/aspect_rules_js/node_modules/.aspect_rules_js/acorn@8.8.2/node_modules/acorn/bin --r-xr-xr-x 100/0 60 1970-01-01 00:00 app/js/private/test/image/bin.runfiles/aspect_rules_js/node_modules/.aspect_rules_js/acorn@8.8.2/node_modules/acorn/bin/acorn -drwxr-xr-x 100/0 0 1970-01-01 00:00 app/js/private/test/image/bin.runfiles/aspect_rules_js/node_modules/.aspect_rules_js/acorn@8.8.2/node_modules/acorn/dist --r-xr-xr-x 100/0 6212 1970-01-01 00:00 app/js/private/test/image/bin.runfiles/aspect_rules_js/node_modules/.aspect_rules_js/acorn@8.8.2/node_modules/acorn/dist/acorn.d.ts --r-xr-xr-x 100/0 218042 1970-01-01 00:00 app/js/private/test/image/bin.runfiles/aspect_rules_js/node_modules/.aspect_rules_js/acorn@8.8.2/node_modules/acorn/dist/acorn.js --r-xr-xr-x 100/0 207423 1970-01-01 00:00 app/js/private/test/image/bin.runfiles/aspect_rules_js/node_modules/.aspect_rules_js/acorn@8.8.2/node_modules/acorn/dist/acorn.mjs --r-xr-xr-x 100/0 49 1970-01-01 00:00 app/js/private/test/image/bin.runfiles/aspect_rules_js/node_modules/.aspect_rules_js/acorn@8.8.2/node_modules/acorn/dist/acorn.mjs.d.ts --r-xr-xr-x 100/0 3261 1970-01-01 00:00 app/js/private/test/image/bin.runfiles/aspect_rules_js/node_modules/.aspect_rules_js/acorn@8.8.2/node_modules/acorn/dist/bin.js --r-xr-xr-x 100/0 1058 1970-01-01 00:00 app/js/private/test/image/bin.runfiles/aspect_rules_js/node_modules/.aspect_rules_js/acorn@8.8.2/node_modules/acorn/package.json -drwxr-xr-x 100/0 0 1970-01-01 00:00 app/js/private/test/image/bin.runfiles/nodejs_linux_amd64 -drwxr-xr-x 100/0 0 1970-01-01 00:00 app/js/private/test/image/bin.runfiles/nodejs_linux_amd64/bin -drwxr-xr-x 100/0 0 1970-01-01 00:00 app/js/private/test/image/bin.runfiles/nodejs_linux_amd64/bin/nodejs -drwxr-xr-x 100/0 0 1970-01-01 00:00 app/js/private/test/image/bin.runfiles/nodejs_linux_amd64/bin/nodejs/bin --r-xr-xr-x 100/0 80316256 1970-01-01 00:00 app/js/private/test/image/bin.runfiles/nodejs_linux_amd64/bin/nodejs/bin/node +drwxr-xr-x 100/0 0 1970-01-01 00:00 app/js/private/test/image/bin_ +drwxr-xr-x 100/0 0 1970-01-01 00:00 app/js/private/test/image/bin_/bin.runfiles +drwxr-xr-x 100/0 0 1970-01-01 00:00 app/js/private/test/image/bin_/bin.runfiles/aspect_rules_js +drwxr-xr-x 100/0 0 1970-01-01 00:00 app/js/private/test/image/bin_/bin.runfiles/aspect_rules_js/js +drwxr-xr-x 100/0 0 1970-01-01 00:00 app/js/private/test/image/bin_/bin.runfiles/aspect_rules_js/js/private +drwxr-xr-x 100/0 0 1970-01-01 00:00 app/js/private/test/image/bin_/bin.runfiles/aspect_rules_js/js/private/node-patches +-r-xr-xr-x 100/0 32555 1970-01-01 00:00 app/js/private/test/image/bin_/bin.runfiles/aspect_rules_js/js/private/node-patches/fs.js +-r-xr-xr-x 100/0 1698 1970-01-01 00:00 app/js/private/test/image/bin_/bin.runfiles/aspect_rules_js/js/private/node-patches/register.js +drwxr-xr-x 100/0 0 1970-01-01 00:00 app/js/private/test/image/bin_/bin.runfiles/aspect_rules_js/js/private/test +drwxr-xr-x 100/0 0 1970-01-01 00:00 app/js/private/test/image/bin_/bin.runfiles/aspect_rules_js/js/private/test/image +drwxr-xr-x 100/0 0 1970-01-01 00:00 app/js/private/test/image/bin_/bin.runfiles/aspect_rules_js/js/private/test/image/node_modules +lrwxrwxr-x 100/0 0 1970-01-01 00:00 app/js/private/test/image/bin_/bin.runfiles/aspect_rules_js/js/private/test/image/node_modules/acorn -> ../../../../../node_modules/.aspect_rules_js/acorn@8.8.2/node_modules/acorn +drwxr-xr-x 100/0 0 1970-01-01 00:00 app/js/private/test/image/bin_/bin.runfiles/aspect_rules_js/node_modules +drwxr-xr-x 100/0 0 1970-01-01 00:00 app/js/private/test/image/bin_/bin.runfiles/aspect_rules_js/node_modules/.aspect_rules_js +drwxr-xr-x 100/0 0 1970-01-01 00:00 app/js/private/test/image/bin_/bin.runfiles/aspect_rules_js/node_modules/.aspect_rules_js/acorn@8.8.2 +drwxr-xr-x 100/0 0 1970-01-01 00:00 app/js/private/test/image/bin_/bin.runfiles/aspect_rules_js/node_modules/.aspect_rules_js/acorn@8.8.2/node_modules +drwxr-xr-x 100/0 0 1970-01-01 00:00 app/js/private/test/image/bin_/bin.runfiles/aspect_rules_js/node_modules/.aspect_rules_js/acorn@8.8.2/node_modules/acorn +-r-xr-xr-x 100/0 19838 1970-01-01 00:00 app/js/private/test/image/bin_/bin.runfiles/aspect_rules_js/node_modules/.aspect_rules_js/acorn@8.8.2/node_modules/acorn/CHANGELOG.md +-r-xr-xr-x 100/0 1099 1970-01-01 00:00 app/js/private/test/image/bin_/bin.runfiles/aspect_rules_js/node_modules/.aspect_rules_js/acorn@8.8.2/node_modules/acorn/LICENSE +-r-xr-xr-x 100/0 10364 1970-01-01 00:00 app/js/private/test/image/bin_/bin.runfiles/aspect_rules_js/node_modules/.aspect_rules_js/acorn@8.8.2/node_modules/acorn/README.md +drwxr-xr-x 100/0 0 1970-01-01 00:00 app/js/private/test/image/bin_/bin.runfiles/aspect_rules_js/node_modules/.aspect_rules_js/acorn@8.8.2/node_modules/acorn/bin +-r-xr-xr-x 100/0 60 1970-01-01 00:00 app/js/private/test/image/bin_/bin.runfiles/aspect_rules_js/node_modules/.aspect_rules_js/acorn@8.8.2/node_modules/acorn/bin/acorn +drwxr-xr-x 100/0 0 1970-01-01 00:00 app/js/private/test/image/bin_/bin.runfiles/aspect_rules_js/node_modules/.aspect_rules_js/acorn@8.8.2/node_modules/acorn/dist +-r-xr-xr-x 100/0 6212 1970-01-01 00:00 app/js/private/test/image/bin_/bin.runfiles/aspect_rules_js/node_modules/.aspect_rules_js/acorn@8.8.2/node_modules/acorn/dist/acorn.d.ts +-r-xr-xr-x 100/0 218042 1970-01-01 00:00 app/js/private/test/image/bin_/bin.runfiles/aspect_rules_js/node_modules/.aspect_rules_js/acorn@8.8.2/node_modules/acorn/dist/acorn.js +-r-xr-xr-x 100/0 207423 1970-01-01 00:00 app/js/private/test/image/bin_/bin.runfiles/aspect_rules_js/node_modules/.aspect_rules_js/acorn@8.8.2/node_modules/acorn/dist/acorn.mjs +-r-xr-xr-x 100/0 49 1970-01-01 00:00 app/js/private/test/image/bin_/bin.runfiles/aspect_rules_js/node_modules/.aspect_rules_js/acorn@8.8.2/node_modules/acorn/dist/acorn.mjs.d.ts +-r-xr-xr-x 100/0 3261 1970-01-01 00:00 app/js/private/test/image/bin_/bin.runfiles/aspect_rules_js/node_modules/.aspect_rules_js/acorn@8.8.2/node_modules/acorn/dist/bin.js +-r-xr-xr-x 100/0 1058 1970-01-01 00:00 app/js/private/test/image/bin_/bin.runfiles/aspect_rules_js/node_modules/.aspect_rules_js/acorn@8.8.2/node_modules/acorn/package.json +drwxr-xr-x 100/0 0 1970-01-01 00:00 app/js/private/test/image/bin_/bin.runfiles/nodejs_linux_amd64 +drwxr-xr-x 100/0 0 1970-01-01 00:00 app/js/private/test/image/bin_/bin.runfiles/nodejs_linux_amd64/bin +drwxr-xr-x 100/0 0 1970-01-01 00:00 app/js/private/test/image/bin_/bin.runfiles/nodejs_linux_amd64/bin/nodejs +drwxr-xr-x 100/0 0 1970-01-01 00:00 app/js/private/test/image/bin_/bin.runfiles/nodejs_linux_amd64/bin/nodejs/bin +-r-xr-xr-x 100/0 80316256 1970-01-01 00:00 app/js/private/test/image/bin_/bin.runfiles/nodejs_linux_amd64/bin/nodejs/bin/node diff --git a/js/private/test/image/default_app.listing b/js/private/test/image/default_app.listing index 1c66349fe..ba45e9af0 100644 --- a/js/private/test/image/default_app.listing +++ b/js/private/test/image/default_app.listing @@ -3,14 +3,16 @@ drwxr-xr-x 0/0 0 1970-01-01 00:00 app/js drwxr-xr-x 0/0 0 1970-01-01 00:00 app/js/private drwxr-xr-x 0/0 0 1970-01-01 00:00 app/js/private/test drwxr-xr-x 0/0 0 1970-01-01 00:00 app/js/private/test/image --r-xr-xr-x 0/0 131 1970-01-01 00:00 app/js/private/test/image/bin -drwxr-xr-x 0/0 0 1970-01-01 00:00 app/js/private/test/image/bin.runfiles -drwxr-xr-x 0/0 0 1970-01-01 00:00 app/js/private/test/image/bin.runfiles/aspect_rules_js -drwxr-xr-x 0/0 0 1970-01-01 00:00 app/js/private/test/image/bin.runfiles/aspect_rules_js/js -drwxr-xr-x 0/0 0 1970-01-01 00:00 app/js/private/test/image/bin.runfiles/aspect_rules_js/js/private -drwxr-xr-x 0/0 0 1970-01-01 00:00 app/js/private/test/image/bin.runfiles/aspect_rules_js/js/private/test -drwxr-xr-x 0/0 0 1970-01-01 00:00 app/js/private/test/image/bin.runfiles/aspect_rules_js/js/private/test/image --r-xr-xr-x 0/0 23908 1970-01-01 00:00 app/js/private/test/image/bin.runfiles/aspect_rules_js/js/private/test/image/bin -drwxr-xr-x 0/0 0 1970-01-01 00:00 app/js/private/test/image/bin.runfiles/aspect_rules_js/js/private/test/image/bin_node_bin --r-xr-xr-x 0/0 133 1970-01-01 00:00 app/js/private/test/image/bin.runfiles/aspect_rules_js/js/private/test/image/bin_node_bin/node --r-xr-xr-x 0/0 20 1970-01-01 00:00 app/js/private/test/image/bin.runfiles/aspect_rules_js/js/private/test/image/main.js +drwxr-xr-x 0/0 0 1970-01-01 00:00 app/js/private/test/image/bin_ +-r-xr-xr-x 0/0 141 1970-01-01 00:00 app/js/private/test/image/bin_/bin +drwxr-xr-x 0/0 0 1970-01-01 00:00 app/js/private/test/image/bin_/bin.runfiles +drwxr-xr-x 0/0 0 1970-01-01 00:00 app/js/private/test/image/bin_/bin.runfiles/aspect_rules_js +drwxr-xr-x 0/0 0 1970-01-01 00:00 app/js/private/test/image/bin_/bin.runfiles/aspect_rules_js/js +drwxr-xr-x 0/0 0 1970-01-01 00:00 app/js/private/test/image/bin_/bin.runfiles/aspect_rules_js/js/private +drwxr-xr-x 0/0 0 1970-01-01 00:00 app/js/private/test/image/bin_/bin.runfiles/aspect_rules_js/js/private/test +drwxr-xr-x 0/0 0 1970-01-01 00:00 app/js/private/test/image/bin_/bin.runfiles/aspect_rules_js/js/private/test/image +drwxr-xr-x 0/0 0 1970-01-01 00:00 app/js/private/test/image/bin_/bin.runfiles/aspect_rules_js/js/private/test/image/bin_ +-r-xr-xr-x 0/0 23908 1970-01-01 00:00 app/js/private/test/image/bin_/bin.runfiles/aspect_rules_js/js/private/test/image/bin_/bin +drwxr-xr-x 0/0 0 1970-01-01 00:00 app/js/private/test/image/bin_/bin.runfiles/aspect_rules_js/js/private/test/image/bin_node_bin +-r-xr-xr-x 0/0 133 1970-01-01 00:00 app/js/private/test/image/bin_/bin.runfiles/aspect_rules_js/js/private/test/image/bin_node_bin/node +-r-xr-xr-x 0/0 20 1970-01-01 00:00 app/js/private/test/image/bin_/bin.runfiles/aspect_rules_js/js/private/test/image/main.js diff --git a/js/private/test/image/default_node_modules.listing b/js/private/test/image/default_node_modules.listing index f7ec7cb22..8132163ae 100644 --- a/js/private/test/image/default_node_modules.listing +++ b/js/private/test/image/default_node_modules.listing @@ -3,36 +3,37 @@ drwxr-xr-x 0/0 0 1970-01-01 00:00 app/js drwxr-xr-x 0/0 0 1970-01-01 00:00 app/js/private drwxr-xr-x 0/0 0 1970-01-01 00:00 app/js/private/test drwxr-xr-x 0/0 0 1970-01-01 00:00 app/js/private/test/image -drwxr-xr-x 0/0 0 1970-01-01 00:00 app/js/private/test/image/bin.runfiles -drwxr-xr-x 0/0 0 1970-01-01 00:00 app/js/private/test/image/bin.runfiles/aspect_rules_js -drwxr-xr-x 0/0 0 1970-01-01 00:00 app/js/private/test/image/bin.runfiles/aspect_rules_js/js -drwxr-xr-x 0/0 0 1970-01-01 00:00 app/js/private/test/image/bin.runfiles/aspect_rules_js/js/private -drwxr-xr-x 0/0 0 1970-01-01 00:00 app/js/private/test/image/bin.runfiles/aspect_rules_js/js/private/node-patches --r-xr-xr-x 0/0 32555 1970-01-01 00:00 app/js/private/test/image/bin.runfiles/aspect_rules_js/js/private/node-patches/fs.js --r-xr-xr-x 0/0 1698 1970-01-01 00:00 app/js/private/test/image/bin.runfiles/aspect_rules_js/js/private/node-patches/register.js -drwxr-xr-x 0/0 0 1970-01-01 00:00 app/js/private/test/image/bin.runfiles/aspect_rules_js/js/private/test -drwxr-xr-x 0/0 0 1970-01-01 00:00 app/js/private/test/image/bin.runfiles/aspect_rules_js/js/private/test/image -drwxr-xr-x 0/0 0 1970-01-01 00:00 app/js/private/test/image/bin.runfiles/aspect_rules_js/js/private/test/image/node_modules -lrwxrwxr-x 0/0 0 1970-01-01 00:00 app/js/private/test/image/bin.runfiles/aspect_rules_js/js/private/test/image/node_modules/acorn -> ../../../../../node_modules/.aspect_rules_js/acorn@8.8.2/node_modules/acorn -drwxr-xr-x 0/0 0 1970-01-01 00:00 app/js/private/test/image/bin.runfiles/aspect_rules_js/node_modules -drwxr-xr-x 0/0 0 1970-01-01 00:00 app/js/private/test/image/bin.runfiles/aspect_rules_js/node_modules/.aspect_rules_js -drwxr-xr-x 0/0 0 1970-01-01 00:00 app/js/private/test/image/bin.runfiles/aspect_rules_js/node_modules/.aspect_rules_js/acorn@8.8.2 -drwxr-xr-x 0/0 0 1970-01-01 00:00 app/js/private/test/image/bin.runfiles/aspect_rules_js/node_modules/.aspect_rules_js/acorn@8.8.2/node_modules -drwxr-xr-x 0/0 0 1970-01-01 00:00 app/js/private/test/image/bin.runfiles/aspect_rules_js/node_modules/.aspect_rules_js/acorn@8.8.2/node_modules/acorn --r-xr-xr-x 0/0 19838 1970-01-01 00:00 app/js/private/test/image/bin.runfiles/aspect_rules_js/node_modules/.aspect_rules_js/acorn@8.8.2/node_modules/acorn/CHANGELOG.md --r-xr-xr-x 0/0 1099 1970-01-01 00:00 app/js/private/test/image/bin.runfiles/aspect_rules_js/node_modules/.aspect_rules_js/acorn@8.8.2/node_modules/acorn/LICENSE --r-xr-xr-x 0/0 10364 1970-01-01 00:00 app/js/private/test/image/bin.runfiles/aspect_rules_js/node_modules/.aspect_rules_js/acorn@8.8.2/node_modules/acorn/README.md -drwxr-xr-x 0/0 0 1970-01-01 00:00 app/js/private/test/image/bin.runfiles/aspect_rules_js/node_modules/.aspect_rules_js/acorn@8.8.2/node_modules/acorn/bin --r-xr-xr-x 0/0 60 1970-01-01 00:00 app/js/private/test/image/bin.runfiles/aspect_rules_js/node_modules/.aspect_rules_js/acorn@8.8.2/node_modules/acorn/bin/acorn -drwxr-xr-x 0/0 0 1970-01-01 00:00 app/js/private/test/image/bin.runfiles/aspect_rules_js/node_modules/.aspect_rules_js/acorn@8.8.2/node_modules/acorn/dist --r-xr-xr-x 0/0 6212 1970-01-01 00:00 app/js/private/test/image/bin.runfiles/aspect_rules_js/node_modules/.aspect_rules_js/acorn@8.8.2/node_modules/acorn/dist/acorn.d.ts --r-xr-xr-x 0/0 218042 1970-01-01 00:00 app/js/private/test/image/bin.runfiles/aspect_rules_js/node_modules/.aspect_rules_js/acorn@8.8.2/node_modules/acorn/dist/acorn.js --r-xr-xr-x 0/0 207423 1970-01-01 00:00 app/js/private/test/image/bin.runfiles/aspect_rules_js/node_modules/.aspect_rules_js/acorn@8.8.2/node_modules/acorn/dist/acorn.mjs --r-xr-xr-x 0/0 49 1970-01-01 00:00 app/js/private/test/image/bin.runfiles/aspect_rules_js/node_modules/.aspect_rules_js/acorn@8.8.2/node_modules/acorn/dist/acorn.mjs.d.ts --r-xr-xr-x 0/0 3261 1970-01-01 00:00 app/js/private/test/image/bin.runfiles/aspect_rules_js/node_modules/.aspect_rules_js/acorn@8.8.2/node_modules/acorn/dist/bin.js --r-xr-xr-x 0/0 1058 1970-01-01 00:00 app/js/private/test/image/bin.runfiles/aspect_rules_js/node_modules/.aspect_rules_js/acorn@8.8.2/node_modules/acorn/package.json -drwxr-xr-x 0/0 0 1970-01-01 00:00 app/js/private/test/image/bin.runfiles/nodejs_linux_amd64 -drwxr-xr-x 0/0 0 1970-01-01 00:00 app/js/private/test/image/bin.runfiles/nodejs_linux_amd64/bin -drwxr-xr-x 0/0 0 1970-01-01 00:00 app/js/private/test/image/bin.runfiles/nodejs_linux_amd64/bin/nodejs -drwxr-xr-x 0/0 0 1970-01-01 00:00 app/js/private/test/image/bin.runfiles/nodejs_linux_amd64/bin/nodejs/bin --r-xr-xr-x 0/0 80316256 1970-01-01 00:00 app/js/private/test/image/bin.runfiles/nodejs_linux_amd64/bin/nodejs/bin/node +drwxr-xr-x 0/0 0 1970-01-01 00:00 app/js/private/test/image/bin_ +drwxr-xr-x 0/0 0 1970-01-01 00:00 app/js/private/test/image/bin_/bin.runfiles +drwxr-xr-x 0/0 0 1970-01-01 00:00 app/js/private/test/image/bin_/bin.runfiles/aspect_rules_js +drwxr-xr-x 0/0 0 1970-01-01 00:00 app/js/private/test/image/bin_/bin.runfiles/aspect_rules_js/js +drwxr-xr-x 0/0 0 1970-01-01 00:00 app/js/private/test/image/bin_/bin.runfiles/aspect_rules_js/js/private +drwxr-xr-x 0/0 0 1970-01-01 00:00 app/js/private/test/image/bin_/bin.runfiles/aspect_rules_js/js/private/node-patches +-r-xr-xr-x 0/0 32555 1970-01-01 00:00 app/js/private/test/image/bin_/bin.runfiles/aspect_rules_js/js/private/node-patches/fs.js +-r-xr-xr-x 0/0 1698 1970-01-01 00:00 app/js/private/test/image/bin_/bin.runfiles/aspect_rules_js/js/private/node-patches/register.js +drwxr-xr-x 0/0 0 1970-01-01 00:00 app/js/private/test/image/bin_/bin.runfiles/aspect_rules_js/js/private/test +drwxr-xr-x 0/0 0 1970-01-01 00:00 app/js/private/test/image/bin_/bin.runfiles/aspect_rules_js/js/private/test/image +drwxr-xr-x 0/0 0 1970-01-01 00:00 app/js/private/test/image/bin_/bin.runfiles/aspect_rules_js/js/private/test/image/node_modules +lrwxrwxr-x 0/0 0 1970-01-01 00:00 app/js/private/test/image/bin_/bin.runfiles/aspect_rules_js/js/private/test/image/node_modules/acorn -> ../../../../../node_modules/.aspect_rules_js/acorn@8.8.2/node_modules/acorn +drwxr-xr-x 0/0 0 1970-01-01 00:00 app/js/private/test/image/bin_/bin.runfiles/aspect_rules_js/node_modules +drwxr-xr-x 0/0 0 1970-01-01 00:00 app/js/private/test/image/bin_/bin.runfiles/aspect_rules_js/node_modules/.aspect_rules_js +drwxr-xr-x 0/0 0 1970-01-01 00:00 app/js/private/test/image/bin_/bin.runfiles/aspect_rules_js/node_modules/.aspect_rules_js/acorn@8.8.2 +drwxr-xr-x 0/0 0 1970-01-01 00:00 app/js/private/test/image/bin_/bin.runfiles/aspect_rules_js/node_modules/.aspect_rules_js/acorn@8.8.2/node_modules +drwxr-xr-x 0/0 0 1970-01-01 00:00 app/js/private/test/image/bin_/bin.runfiles/aspect_rules_js/node_modules/.aspect_rules_js/acorn@8.8.2/node_modules/acorn +-r-xr-xr-x 0/0 19838 1970-01-01 00:00 app/js/private/test/image/bin_/bin.runfiles/aspect_rules_js/node_modules/.aspect_rules_js/acorn@8.8.2/node_modules/acorn/CHANGELOG.md +-r-xr-xr-x 0/0 1099 1970-01-01 00:00 app/js/private/test/image/bin_/bin.runfiles/aspect_rules_js/node_modules/.aspect_rules_js/acorn@8.8.2/node_modules/acorn/LICENSE +-r-xr-xr-x 0/0 10364 1970-01-01 00:00 app/js/private/test/image/bin_/bin.runfiles/aspect_rules_js/node_modules/.aspect_rules_js/acorn@8.8.2/node_modules/acorn/README.md +drwxr-xr-x 0/0 0 1970-01-01 00:00 app/js/private/test/image/bin_/bin.runfiles/aspect_rules_js/node_modules/.aspect_rules_js/acorn@8.8.2/node_modules/acorn/bin +-r-xr-xr-x 0/0 60 1970-01-01 00:00 app/js/private/test/image/bin_/bin.runfiles/aspect_rules_js/node_modules/.aspect_rules_js/acorn@8.8.2/node_modules/acorn/bin/acorn +drwxr-xr-x 0/0 0 1970-01-01 00:00 app/js/private/test/image/bin_/bin.runfiles/aspect_rules_js/node_modules/.aspect_rules_js/acorn@8.8.2/node_modules/acorn/dist +-r-xr-xr-x 0/0 6212 1970-01-01 00:00 app/js/private/test/image/bin_/bin.runfiles/aspect_rules_js/node_modules/.aspect_rules_js/acorn@8.8.2/node_modules/acorn/dist/acorn.d.ts +-r-xr-xr-x 0/0 218042 1970-01-01 00:00 app/js/private/test/image/bin_/bin.runfiles/aspect_rules_js/node_modules/.aspect_rules_js/acorn@8.8.2/node_modules/acorn/dist/acorn.js +-r-xr-xr-x 0/0 207423 1970-01-01 00:00 app/js/private/test/image/bin_/bin.runfiles/aspect_rules_js/node_modules/.aspect_rules_js/acorn@8.8.2/node_modules/acorn/dist/acorn.mjs +-r-xr-xr-x 0/0 49 1970-01-01 00:00 app/js/private/test/image/bin_/bin.runfiles/aspect_rules_js/node_modules/.aspect_rules_js/acorn@8.8.2/node_modules/acorn/dist/acorn.mjs.d.ts +-r-xr-xr-x 0/0 3261 1970-01-01 00:00 app/js/private/test/image/bin_/bin.runfiles/aspect_rules_js/node_modules/.aspect_rules_js/acorn@8.8.2/node_modules/acorn/dist/bin.js +-r-xr-xr-x 0/0 1058 1970-01-01 00:00 app/js/private/test/image/bin_/bin.runfiles/aspect_rules_js/node_modules/.aspect_rules_js/acorn@8.8.2/node_modules/acorn/package.json +drwxr-xr-x 0/0 0 1970-01-01 00:00 app/js/private/test/image/bin_/bin.runfiles/nodejs_linux_amd64 +drwxr-xr-x 0/0 0 1970-01-01 00:00 app/js/private/test/image/bin_/bin.runfiles/nodejs_linux_amd64/bin +drwxr-xr-x 0/0 0 1970-01-01 00:00 app/js/private/test/image/bin_/bin.runfiles/nodejs_linux_amd64/bin/nodejs +drwxr-xr-x 0/0 0 1970-01-01 00:00 app/js/private/test/image/bin_/bin.runfiles/nodejs_linux_amd64/bin/nodejs/bin +-r-xr-xr-x 0/0 80316256 1970-01-01 00:00 app/js/private/test/image/bin_/bin.runfiles/nodejs_linux_amd64/bin/nodejs/bin/node