feat: add special handling to js_run_devserver for 1p deps to improve…

… watch mode performance (#1411)

e2e/webpack_devserver/.bazelignore

@@ -1 +1,2 @@
-node_modules
+node_modules
+mylib/node_modules

e2e/webpack_devserver/BUILD.bazel

@@ -28,6 +28,7 @@ js_run_devserver(
         "webpack.config.js",
         ":node_modules",
     ],
+    log_level = "debug",
     tool = "webpack_binary",
 )
 
@@ -45,5 +46,6 @@ js_run_devserver(
         "webpack.config.cjs",
         ":node_modules",
     ],
+    log_level = "debug",
     tool = "webpack_binary",
 )

e2e/webpack_devserver/mylib/BUILD.bazel

@@ -0,0 +1,10 @@
+load("@aspect_rules_js//npm:defs.bzl", "npm_package")
+
+npm_package(
+    name = "mylib",
+    srcs = [
+        "index.js",
+        "package.json",
+    ],
+    visibility = ["//visibility:public"],
+)

e2e/webpack_devserver/mylib/index.js

@@ -0,0 +1,5 @@
+const packageJson = require('./package.json')
+const chalk = require('chalk')
+module.exports = {
+    name: () => chalk.blue(packageJson.name),
+}

e2e/webpack_devserver/mylib/package.json

@@ -0,0 +1,6 @@
+{
+    "name": "@mycorp/mylib",
+    "dependencies": {
+        "chalk": "^4"
+    }
+}

e2e/webpack_devserver/package.json

@@ -7,6 +7,7 @@
         "@bazel/ibazel": "0.16.2"
     },
     "dependencies": {
-        "lodash": "4.17.21"
+        "lodash": "4.17.21",
+        "@mycorp/mylib": "workspace:*"
     }
 }

e2e/webpack_devserver/pnpm-workspace.yaml

@@ -1,2 +1,3 @@
 packages:
     - '.'
+    - 'mylib'

e2e/webpack_devserver/serve_test.sh

@@ -14,15 +14,20 @@ _sedi() {
     sed "${sedi[@]}" "$@"
 }
 
+echo ""
+echo ""
 echo "TEST - $0: $1"
 
-./node_modules/.bin/ibazel run "$1" "$BZLMOD_FLAG" >/dev/null 2>&1 &
+ibazel_logs=$(mktemp)
+echo "Capturing ibazel logs to $ibazel_logs"
+./node_modules/.bin/ibazel run "$1" "$BZLMOD_FLAG" >"$ibazel_logs" 2>&1 &
 ibazel_pid="$!"
 
 function _exit {
-    echo "Cleanup..."
     kill "$ibazel_pid"
-    git checkout src/index.html
+    git checkout src/index.html >/dev/null 2>&1
+    git checkout mylib/index.js >/dev/null 2>&1
+    rm -f "$ibazel_logs"
 }
 trap _exit EXIT
 
@@ -43,6 +48,11 @@ if ! curl http://localhost:8080/index.html --fail 2>/dev/null | grep "Getting St
     exit 1
 fi
 
+if ! curl http://localhost:8080/main.js --fail 2>/dev/null | grep "chalk.blue(packageJson.name)"; then
+    echo "ERROR: Expected http://localhost:8080/main.js to contain 'chalk.blue(packageJson.name)'"
+    exit 1
+fi
+
 _sedi 's#Getting Started#Goodbye#' src/index.html
 
 echo "Waiting 5 seconds for ibazel rebuild after change to src/index.html..."
@@ -53,4 +63,46 @@ if ! curl http://localhost:8080/index.html --fail 2>/dev/null | grep "Goodbye";
     exit 1
 fi
 
+_sedi 's#blue#red#' mylib/index.js
+
+echo "Waiting 5 seconds for ibazel rebuild after change to mylib/index.js..."
+sleep 5
+
+if ! curl http://localhost:8080/main.js --fail 2>/dev/null | grep "chalk.red(packageJson.name)"; then
+    echo "ERROR: Expected http://localhost:8080/main.js to contain 'chalk.red(packageJson.name)'"
+    exit 1
+fi
+
+echo "Checking log file $ibazel_logs"
+
+count=$(grep -c "Syncing file node_modules/.aspect_rules_js/@mycorp+mylib@0.0.0/node_modules/@mycorp/mylib/index.js" "$ibazel_logs" || true)
+if [[ "$count" -ne 2 ]]; then
+    echo "ERROR: expected to have synced @mycorp/mylib/index.js 2 times but found ${count}"
+    exit 1
+fi
+
+count=$(grep -c "Skipping file node_modules/.aspect_rules_js/@mycorp+mylib@0.0.0/node_modules/@mycorp/mylib/index.js since its timestamp has not changed" "$ibazel_logs" || true)
+if [[ "$count" -ne 1 ]]; then
+    echo "ERROR: expected to have skipped @mycorp/mylib/index.js due to timestamp 1 time but found ${count}"
+    exit 1
+fi
+
+count=$(grep -c "Syncing file node_modules/.aspect_rules_js/@mycorp+mylib@0.0.0/node_modules/@mycorp/mylib/package.json" "$ibazel_logs" || true)
+if [[ "$count" -ne 1 ]]; then
+    echo "ERROR: expected to have synced @mycorp/mylib/package.json 1 time but found ${count}"
+    exit 1
+fi
+
+count=$(grep -c "Skipping file node_modules/.aspect_rules_js/@mycorp+mylib@0.0.0/node_modules/@mycorp/mylib/package.json since its timestamp has not changed" "$ibazel_logs" || true)
+if [[ "$count" -ne 1 ]]; then
+    echo "ERROR: expected to have skipped @mycorp/mylib/package.json due to timestamp 1 time but found ${count}"
+    exit 1
+fi
+
+count=$(grep -c "Skipping file node_modules/.aspect_rules_js/@mycorp+mylib@0.0.0/node_modules/@mycorp/mylib/package.json since contents have not changed" "$ibazel_logs" || true)
+if [[ "$count" -ne 1 ]]; then
+    echo "ERROR: expected to have skipped @mycorp/mylib/package.json due to contents 1 time but found ${count}"
+    exit 1
+fi
+
 echo "All tests passed"

e2e/webpack_devserver/src/index.js

@@ -1,10 +1,11 @@
 import _ from 'lodash'
+import { name } from '@mycorp/mylib'
 
 function component() {
     const element = document.createElement('div')
 
     // Lodash, currently included via a script, is required for this line to work
-    element.innerHTML = _.join(['Hello', 'webpack'], ' ')
+    element.innerHTML = _.join(['Hello', 'webpack', name()], ' ')
 
     return element
 }

e2e/webpack_devserver_esm/.bazelignore

@@ -1 +1,2 @@
-node_modules
+node_modules
+mylib/node_modules

e2e/webpack_devserver_esm/BUILD.bazel

@@ -28,5 +28,6 @@ js_run_devserver(
         "webpack.config.mjs",
         ":node_modules",
     ],
+    log_level = "debug",
     tool = "webpack_binary",
 )

e2e/webpack_devserver_esm/mylib/BUILD.bazel

@@ -0,0 +1,10 @@
+load("@aspect_rules_js//npm:defs.bzl", "npm_package")
+
+npm_package(
+    name = "mylib",
+    srcs = [
+        "index.js",
+        "package.json",
+    ],
+    visibility = ["//visibility:public"],
+)

e2e/webpack_devserver_esm/mylib/index.js

@@ -0,0 +1,5 @@
+import packageJson from './package.json'
+import chalk from 'chalk'
+export function name() {
+    return chalk.blue(packageJson.name)
+}

e2e/webpack_devserver_esm/mylib/package.json

@@ -0,0 +1,6 @@
+{
+    "name": "@mycorp/mylib",
+    "dependencies": {
+        "chalk": "^4"
+    }
+}

e2e/webpack_devserver_esm/package.json

@@ -8,6 +8,7 @@
         "@bazel/ibazel": "0.16.2"
     },
     "dependencies": {
-        "lodash": "4.17.21"
+        "lodash": "4.17.21",
+        "@mycorp/mylib": "workspace:*"
     }
 }

e2e/webpack_devserver_esm/pnpm-workspace.yaml

@@ -1,2 +1,3 @@
 packages:
     - '.'
+    - 'mylib'