refactor: remove vendored webpack versions, user must provider their …

…own webpack tool from their node_modules

.bazelignore

@@ -1,2 +1,4 @@
+
 node_modules
+webpack/tests/node_modules
 e2e

.github/workflows/ci.yaml

@@ -63,7 +63,6 @@ jobs:
         folder:
           - '.'
           - 'e2e/loaders'
-          - 'e2e/webpack_binary'
           - 'e2e/workspace'
           - 'e2e/worker'
         exclude:

.npmrc

@@ -0,0 +1,4 @@
+# Disabling pnpm [hoisting](https://pnpm.io/npmrc#hoist) by setting `hoist=false` is recommended on
+# projects using rules_js so that pnpm outside of Bazel lays out a node_modules tree similar to what
+# rules_js lays out under Bazel (without a hidden node_modules/.pnpm/node_modules)
+hoist=false

BUILD.bazel

@@ -1,5 +1,8 @@
 load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
 load("@bazel_gazelle//:def.bzl", "gazelle", "gazelle_binary")
+load("@npm//:defs.bzl", "npm_link_all_packages")
+
+npm_link_all_packages(name = "node_modules")
 
 gazelle_binary(
     name = "gazelle_bin",

WORKSPACE

@@ -32,21 +32,15 @@ load("@aspect_rules_js//npm:npm_import.bzl", "npm_translate_lock")
 
 npm_translate_lock(
     name = "npm",
-    pnpm_lock = "//webpack/tests:pnpm-lock.yaml",
+    npmrc = "//:.npmrc",
+    pnpm_lock = "//:pnpm-lock.yaml",
+    verify_node_modules_ignored = "//:.bazelignore",
 )
 
 load("@npm//:repositories.bzl", "npm_repositories")
 
 npm_repositories()
 
-load("//webpack:repositories.bzl", "webpack_repositories")
-
-webpack_repositories(name = "webpack")
-
-load("@webpack//:npm_repositories.bzl", webpack_npm_repositories = "npm_repositories")
-
-webpack_npm_repositories()
-
 # For running our own unit tests
 load("@bazel_skylib//lib:unittest.bzl", "register_unittest_toolchains")
 

docs/rules.md

@@ -15,10 +15,7 @@ webpack_binary(<a href="#webpack_binary-name">name</a>, <a href="#webpack_binary
 
 Create a webpack binary target from linked node_modules in the user's workspace.
 
-Pass this into the `webpack` attribute of webpack_bundle to use your own linked
-version of webpack rather than rules_webpack's version, which can help to avoid
-certain errors caused by having two copies of webpack. The following three packages
-must be linked into the node_modules virtual store target:
+The following three packages must be linked into the node_modules supplied:
 
     webpack, webpack-cli, webpack-dev-server
 
@@ -37,8 +34,8 @@ must be linked into the node_modules virtual store target:
 ## webpack_bundle
 
 <pre>
-webpack_bundle(<a href="#webpack_bundle-name">name</a>, <a href="#webpack_bundle-srcs">srcs</a>, <a href="#webpack_bundle-args">args</a>, <a href="#webpack_bundle-deps">deps</a>, <a href="#webpack_bundle-chdir">chdir</a>, <a href="#webpack_bundle-data">data</a>, <a href="#webpack_bundle-env">env</a>, <a href="#webpack_bundle-output_dir">output_dir</a>, <a href="#webpack_bundle-entry_point">entry_point</a>, <a href="#webpack_bundle-entry_points">entry_points</a>,
-               <a href="#webpack_bundle-webpack_config">webpack_config</a>, <a href="#webpack_bundle-webpack">webpack</a>, <a href="#webpack_bundle-webpack_worker">webpack_worker</a>, <a href="#webpack_bundle-use_execroot_entry_point">use_execroot_entry_point</a>, <a href="#webpack_bundle-supports_workers">supports_workers</a>,
+webpack_bundle(<a href="#webpack_bundle-name">name</a>, <a href="#webpack_bundle-node_modules">node_modules</a>, <a href="#webpack_bundle-srcs">srcs</a>, <a href="#webpack_bundle-args">args</a>, <a href="#webpack_bundle-deps">deps</a>, <a href="#webpack_bundle-chdir">chdir</a>, <a href="#webpack_bundle-data">data</a>, <a href="#webpack_bundle-env">env</a>, <a href="#webpack_bundle-output_dir">output_dir</a>, <a href="#webpack_bundle-entry_point">entry_point</a>,
+               <a href="#webpack_bundle-entry_points">entry_points</a>, <a href="#webpack_bundle-webpack_config">webpack_config</a>, <a href="#webpack_bundle-use_execroot_entry_point">use_execroot_entry_point</a>, <a href="#webpack_bundle-supports_workers">supports_workers</a>,
                <a href="#webpack_bundle-allow_execroot_entry_point_with_no_copy_data_to_bin">allow_execroot_entry_point_with_no_copy_data_to_bin</a>, <a href="#webpack_bundle-kwargs">kwargs</a>)
 </pre>
 
@@ -50,6 +47,7 @@ Runs the webpack-cli under bazel
 | Name  | Description | Default Value |
 | :------------- | :------------- | :------------- |
 | <a id="webpack_bundle-name"></a>name |  A unique name for this target.   |  none |
+| <a id="webpack_bundle-node_modules"></a>node_modules |  Label pointing to the linked node_modules target where webpack is linked, e.g. <code>//:node_modules</code>.<br><br>The following three packages must be linked into the node_modules supplied:<br><br>    webpack, webpack-cli, webpack-dev-server   |  none |
 | <a id="webpack_bundle-srcs"></a>srcs |  Non-entry point JavaScript source files from the workspace.<br><br>You must not repeat file(s) passed to entry_point/entry_points.   |  <code>[]</code> |
 | <a id="webpack_bundle-args"></a>args |  Command line arguments to pass to Webpack.<br><br>These argument passed on the command line before arguments that are added by the rule. Run <code>bazel</code> with <code>--subcommands</code> to see what Webpack CLI command line was invoked.<br><br>See the [Webpack CLI docs](https://webpack.js.org/api/cli/) for a complete list of supported arguments.   |  <code>[]</code> |
 | <a id="webpack_bundle-deps"></a>deps |  Runtime dependencies which may be loaded during compilation.   |  <code>[]</code> |
@@ -60,9 +58,7 @@ Runs the webpack-cli under bazel
 | <a id="webpack_bundle-entry_point"></a>entry_point |  The point where to start the application bundling process.<br><br>See https://webpack.js.org/concepts/entry-points/<br><br>Exactly one of <code>entry_point</code> to <code>entry_points</code> must be specified if <code>output_dir</code> is <code>False</code>.   |  <code>None</code> |
 | <a id="webpack_bundle-entry_points"></a>entry_points |  The map of entry points to bundle names.<br><br>See https://webpack.js.org/concepts/entry-points/<br><br>Exactly one of <code>entry_point</code> to <code>entry_points</code> must be specified if <code>output_dir</code> is <code>False</code>.   |  <code>{}</code> |
 | <a id="webpack_bundle-webpack_config"></a>webpack_config |  Webpack configuration file.<br><br>See https://webpack.js.org/configuration/   |  <code>None</code> |
-| <a id="webpack_bundle-webpack"></a>webpack |  Target that executes the webpack-cli binary.   |  <code>Label("@webpack//:webpack")</code> |
-| <a id="webpack_bundle-webpack_worker"></a>webpack_worker |  Target that executes the webpack-cli binary as a worker.   |  <code>Label("@webpack//:worker")</code> |
-| <a id="webpack_bundle-use_execroot_entry_point"></a>use_execroot_entry_point |  Use the <code>entry_point</code> script of the <code>webpack</code> <code>js_binary</code> that is in the execroot output tree instead of the copy that is in runfiles.<br><br><code>webpack</code> (and <code>webpack_worker</code> if <code>supports_workers</code> is one) runfiles are hoisted to the target platform when this is configured and included as target platform execroot inputs to the action.<br><br>Using the entry point script that is in the execroot output tree means that there will be no conflicting runfiles <code>node_modules</code> in the node_modules resolution path which can confuse npm packages such as next and react that don't like being resolved in multiple node_modules trees. This more closely emulates the environment that tools such as Next.js see when they are run outside of Bazel.<br><br>When True, the <code>webpack</code> <code>js_binary</code> must have <code>copy_data_to_bin</code> set to True (the default) so that all data files needed by the binary are available in the execroot output tree. This requirement can be turned off with by setting <code>allow_execroot_entry_point_with_no_copy_data_to_bin</code> to True.   |  <code>True</code> |
+| <a id="webpack_bundle-use_execroot_entry_point"></a>use_execroot_entry_point |  Use the <code>entry_point</code> script of the <code>webpack</code> <code>js_binary</code> that is in the execroot output tree instead of the copy that is in runfiles.<br><br>When set, runfiles are hoisted to the target platform when this is configured and included as target platform execroot inputs to the action.<br><br>Using the entry point script that is in the execroot output tree means that there will be no conflicting runfiles <code>node_modules</code> in the node_modules resolution path which can confuse npm packages such as next and react that don't like being resolved in multiple node_modules trees. This more closely emulates the environment that tools such as Next.js see when they are run outside of Bazel.<br><br>When True, the <code>webpack</code> <code>js_binary</code> must have <code>copy_data_to_bin</code> set to True (the default) so that all data files needed by the binary are available in the execroot output tree. This requirement can be turned off with by setting <code>allow_execroot_entry_point_with_no_copy_data_to_bin</code> to True.   |  <code>True</code> |
 | <a id="webpack_bundle-supports_workers"></a>supports_workers |  Experimental! Use only with caution.<br><br>Allows you to enable the Bazel Worker strategy for this library.   |  <code>False</code> |
 | <a id="webpack_bundle-allow_execroot_entry_point_with_no_copy_data_to_bin"></a>allow_execroot_entry_point_with_no_copy_data_to_bin |  Turn off validation that the <code>webpack</code> <code>js_binary</code> has <code>copy_data_to_bin</code> set to True when <code>use_execroot_entry_point</code> is set to True.<br><br>See <code>use_execroot_entry_point</code> doc for more info.   |  <code>False</code> |
 | <a id="webpack_bundle-kwargs"></a>kwargs |  Additional arguments   |  none |
@@ -73,8 +69,8 @@ Runs the webpack-cli under bazel
 ## webpack_devserver
 
 <pre>
-webpack_devserver(<a href="#webpack_devserver-name">name</a>, <a href="#webpack_devserver-chdir">chdir</a>, <a href="#webpack_devserver-env">env</a>, <a href="#webpack_devserver-entry_point">entry_point</a>, <a href="#webpack_devserver-entry_points">entry_points</a>, <a href="#webpack_devserver-webpack_config">webpack_config</a>, <a href="#webpack_devserver-args">args</a>, <a href="#webpack_devserver-data">data</a>, <a href="#webpack_devserver-mode">mode</a>,
-                  <a href="#webpack_devserver-webpack">webpack</a>, <a href="#webpack_devserver-kwargs">kwargs</a>)
+webpack_devserver(<a href="#webpack_devserver-name">name</a>, <a href="#webpack_devserver-node_modules">node_modules</a>, <a href="#webpack_devserver-chdir">chdir</a>, <a href="#webpack_devserver-env">env</a>, <a href="#webpack_devserver-entry_point">entry_point</a>, <a href="#webpack_devserver-entry_points">entry_points</a>, <a href="#webpack_devserver-webpack_config">webpack_config</a>, <a href="#webpack_devserver-args">args</a>,
+                  <a href="#webpack_devserver-data">data</a>, <a href="#webpack_devserver-mode">mode</a>, <a href="#webpack_devserver-kwargs">kwargs</a>)
 </pre>
 
 Runs the webpack devserver.
@@ -90,6 +86,7 @@ under the hood.
 | Name  | Description | Default Value |
 | :------------- | :------------- | :------------- |
 | <a id="webpack_devserver-name"></a>name |  A unique name for this target.   |  none |
+| <a id="webpack_devserver-node_modules"></a>node_modules |  Label pointing to the linked node_modules target where webpack is linked, e.g. <code>//:node_modules</code>.<br><br>The following three packages must be linked into the node_modules supplied:<br><br>    webpack, webpack-cli, webpack-dev-server   |  none |
 | <a id="webpack_devserver-chdir"></a>chdir |  Working directory to run Webpack under.<br><br>This is needed to workaround some buggy resolvers in webpack loaders, which assume that the node_modules tree is located in a parent of the working directory rather than a parent of the script with the require statement.<br><br>Note that any relative paths in your configuration may need to be adjusted so they are relative to the new working directory.<br><br>See also: https://github.com/aspect-build/rules_js/blob/main/docs/js_binary.md#js_binary-chdir   |  <code>None</code> |
 | <a id="webpack_devserver-env"></a>env |  Environment variables of the action.<br><br>Subject to <code>$(location)</code> and make variable expansion.   |  <code>{}</code> |
 | <a id="webpack_devserver-entry_point"></a>entry_point |  The point where to start the application bundling process.<br><br>See https://webpack.js.org/concepts/entry-points/<br><br>Only one of <code>entry_point</code> to <code>entry_points</code> must be specified.   |  <code>None</code> |
@@ -98,7 +95,6 @@ under the hood.
 | <a id="webpack_devserver-args"></a>args |  Additional arguments to pass to webpack.<br><br>The <code>serve</code> command, the webpack config file (<code>--config</code>) and the mode (<code>--mode</code>) are automatically set.   |  <code>[]</code> |
 | <a id="webpack_devserver-data"></a>data |  Bundle and runtime dependencies of the program.<br><br>Should include the <code>webpack_bundle</code> rule <code>srcs</code> and <code>deps</code>.<br><br>The webpack config and entry_point[s] are automatically passed to data and should not be repeated.   |  <code>[]</code> |
 | <a id="webpack_devserver-mode"></a>mode |  The mode to pass to <code>--mode</code>.   |  <code>"development"</code> |
-| <a id="webpack_devserver-webpack"></a>webpack |  The webpack js_binary to use.   |  <code>Label("@webpack//:webpack")</code> |
 | <a id="webpack_devserver-kwargs"></a>kwargs |  Additional arguments. See [js_run_devserver](https://github.com/aspect-build/rules_js/blob/main/docs/js_run_devserver.md).   |  none |
 
 

e2e/loaders/BUILD.bazel

@@ -10,6 +10,7 @@ webpack_bundle(
         "src/component.js",
         "src/styles.css",
     ],
+    node_modules = "//:node_modules",
     output_dir = True,
     webpack_config = ":webpack.css.cjs",
     deps = [
@@ -24,6 +25,7 @@ webpack_bundle(
         "src/component.js",
         "src/styles.css",
     ],
+    node_modules = "//:node_modules",
     output_dir = True,
     webpack_config = ":webpack.css.cjs",
     deps = [
@@ -38,6 +40,7 @@ webpack_bundle(
         "src/index.ts",
         "tsconfig.json",
     ],
+    node_modules = "//:node_modules",
     output_dir = True,
     webpack_config = ":webpack.config.cjs",
     deps = [
@@ -51,6 +54,7 @@ webpack_bundle(
         "src/index.ts",
         "tsconfig.json",
     ],
+    node_modules = "//:node_modules",
     output_dir = True,
     webpack_config = ":webpack.config.cjs",
     deps = [

e2e/loaders/WORKSPACE

@@ -19,15 +19,6 @@ nodejs_register_toolchains(
     node_version = DEFAULT_NODE_VERSION,
 )
 
-# Fetch and register the webpack tool
-load("@aspect_rules_webpack//webpack:repositories.bzl", "webpack_repositories")
-
-webpack_repositories(name = "webpack")
-
-load("@webpack//:npm_repositories.bzl", webpack_npm_repositories = "npm_repositories")
-
-webpack_npm_repositories()
-
 # brought as a dep by webpack ruleset
 load("@aspect_rules_js//npm:npm_import.bzl", "npm_translate_lock")
 
@@ -39,4 +30,5 @@ npm_translate_lock(
 )
 
 load("@npm//:repositories.bzl", "npm_repositories")
-npm_repositories()
+
+npm_repositories()

e2e/loaders/package.json

@@ -3,11 +3,12 @@
     "clean": "rm -rf dist node_modules"
   },
   "devDependencies": {
-    "css-loader": "^6.7.2",
-    "mini-css-extract-plugin": "2.7.0",
-    "ts-loader": "9.4.1",
+    "css-loader": "6.7.3",
+    "mini-css-extract-plugin": "2.7.5",
+    "ts-loader": "9.4.2",
     "typescript": "4.8.4",
-    "webpack": "5.69.1",
-    "webpack-cli": "^5.0.0"
+    "webpack": "5.76.2",
+    "webpack-cli": "5.0.1",
+    "webpack-dev-server": "4.13.1"
   }
 }