Relocate selenium-webdriver to root directory

.bazelignore

@@ -23,5 +23,5 @@ java/build/production
 java/client/build
 java/server/build
 javascript/grid-ui/node_modules
-javascript/node/selenium-webdriver/node_modules
+javascript/selenium-webdriver/node_modules
 node_modules

.github/workflows/nightly.yml

@@ -174,8 +174,8 @@ jobs:
       cache-key: javascript-nightly
       node-version: '22.x'
       run: |
-        sed -i 's|https://registry.npmjs.org/|https://npm.pkg.github.com|g' javascript/node/selenium-webdriver/package.json
-        sed -i 's|"name": "selenium-webdriver"|"name": "@seleniumhq/selenium-webdriver"|g' javascript/node/selenium-webdriver/package.json
+        sed -i 's|https://registry.npmjs.org/|https://npm.pkg.github.com|g' javascript/selenium-webdriver/package.json
+        sed -i 's|"name": "selenium-webdriver"|"name": "@seleniumhq/selenium-webdriver"|g' javascript/selenium-webdriver/package.json
         echo "//npm.pkg.github.com/:_authToken=${NODE_AUTH_TOKEN}" >> ~/.npmrc
         echo "@seleniumhq:registry=https://npm.pkg.github.com" >> ~/.npmrc
         echo "always-auth=true" >> ~/.npmrc

.github/workflows/update-documentation.yml

@@ -87,7 +87,7 @@ jobs:
         if: ${{ matrix.language == 'node' }}
         run: |
           npm install
-          npm install --prefix javascript/node/selenium-webdriver
+          npm install --prefix javascript/selenium-webdriver
       - name: Update Documentation
         run: ./go ${{ matrix.language }}:docs
       - name: Documentation Pull Request

.gitignore

@@ -19,11 +19,11 @@ dotnet/packages/
 java/client/src/org/openqa/selenium/ie/IeReturnTypes.java
 java/server/test/org/openqa/selenium/example
 javascript/deps.js
-javascript/node/selenium-webdriver/node_modules/
-javascript/node/selenium-webdriver/lib/atoms/find-elements.js
-javascript/node/selenium-webdriver/lib/atoms/get-attribute.js
-javascript/node/selenium-webdriver/lib/atoms/is-displayed.js
-javascript/node/selenium-webdriver/lib/atoms/mutation-listener.js
+javascript/selenium-webdriver/node_modules/
+javascript/selenium-webdriver/lib/atoms/find-elements.js
+javascript/selenium-webdriver/lib/atoms/get-attribute.js
+javascript/selenium-webdriver/lib/atoms/is-displayed.js
+javascript/selenium-webdriver/lib/atoms/mutation-listener.js
 javascript/safari-driver/node_modules/
 javascript/webdriver/devtools/types/
 .idea/vcs.xml
@@ -137,7 +137,7 @@ MODULE.bazel.lock
 # Engflow
 *.crt
 *.key
-javascript/node/selenium-webdriver/.vscode/settings.json
+javascript/selenium-webdriver/.vscode/settings.json
 
 dotnet-bin
 .metadata/

.skipped-tests

@@ -19,14 +19,14 @@
 -//javascript/atoms:test-edge
 -//javascript/atoms:test-firefox-beta
 -//javascript/chrome-driver/...
--//javascript/node/selenium-webdriver:test-bidi-network-test.js-chrome
--//javascript/node/selenium-webdriver:test-builder-test.js-chrome
--//javascript/node/selenium-webdriver:test-builder-test.js-firefox
--//javascript/node/selenium-webdriver:test-chrome-devtools-test.js-chrome
--//javascript/node/selenium-webdriver:test-chrome-options-test.js-chrome
--//javascript/node/selenium-webdriver:test-chrome-service-test.js-chrome
--//javascript/node/selenium-webdriver:test-firefox-options-test.js-firefox
--//javascript/node/selenium-webdriver:test-lib-capabilities-test.js-chrome
+-//javascript/selenium-webdriver:test-bidi-network-test.js-chrome
+-//javascript/selenium-webdriver:test-builder-test.js-chrome
+-//javascript/selenium-webdriver:test-builder-test.js-firefox
+-//javascript/selenium-webdriver:test-chrome-devtools-test.js-chrome
+-//javascript/selenium-webdriver:test-chrome-options-test.js-chrome
+-//javascript/selenium-webdriver:test-chrome-service-test.js-chrome
+-//javascript/selenium-webdriver:test-firefox-options-test.js-firefox
+-//javascript/selenium-webdriver:test-lib-capabilities-test.js-chrome
 -//py:test-chrome-test/selenium/webdriver/chrome/chrome_launcher_tests.py
 -//py:test-chrome-test/selenium/webdriver/chrome/chrome_service_tests.py
 -//py:test-chrome-test/selenium/webdriver/chrome/proxy_tests.py

BUILD.bazel

@@ -72,7 +72,7 @@ java_binary(
 
 npm_link_package(
     name = "node_modules/selenium-webdriver",
-    src = "//javascript/node/selenium-webdriver",
+    src = "//javascript/selenium-webdriver",
 )
 
 platform(

CONTRIBUTING.md

@@ -109,7 +109,7 @@ installed on your local machine, or by executing:
 
 ```shell
 # Example of adding a dep to the JS webdriver bindings 
-cd javascript/node/selenium-webdriver
+cd javascript/selenium-webdriver
 bazel run javascript:pnpm -- install my-amazing-dep --dir $PWD
 ```
 
@@ -255,7 +255,7 @@ Build your code for the latest changes and run tests locally.
 
   Node Tests
   ```shell
-  % bazel test //javascript/node/selenium-webdriver:all
+  % bazel test //javascript/selenium-webdriver:all
   ```
 
   Firefox Atom Tests

MODULE.bazel

@@ -55,7 +55,7 @@ npm.npm_translate_lock(
         "@//:package.json",
         "@//:pnpm-workspace.yaml",
         "@//javascript/grid-ui:package.json",
-        "@//javascript/node/selenium-webdriver:package.json",
+        "@//javascript/selenium-webdriver:package.json",
     ],
     generate_bzl_library_targets = True,
     npmrc = "//:.npmrc",

README.md

@@ -349,13 +349,13 @@ bazel test //java/test/org/openqa/selenium/chrome:ChromeDriverFunctionalTest
 To run the tests run:
 
 ```sh
-bazel test //javascript/node/selenium-webdriver:tests
+bazel test //javascript/selenium-webdriver:tests
 ```
 
 You can use `--test_env` to pass in the browser name as `SELENIUM_BROWSER`.
 
 ```sh
-bazel test //javascript/node/selenium-webdriver:tests --test_env=SELENIUM_BROWSER=firefox
+bazel test //javascript/selenium-webdriver:tests --test_env=SELENIUM_BROWSER=firefox
 ```
 
 </details>

Rakefile

@@ -453,7 +453,7 @@ namespace :side do
 end
 
 def node_version
-  File.foreach('javascript/node/selenium-webdriver/package.json') do |line|
+  File.foreach('javascript/selenium-webdriver/package.json') do |line|
     return line.split(':').last.strip.tr('",', '') if line.include?('version')
   end
 end
@@ -465,7 +465,7 @@ namespace :node do
   ]
 
   task atoms: atom_list do
-    base_dir = 'javascript/node/selenium-webdriver/lib/atoms'
+    base_dir = 'javascript/selenium-webdriver/lib/atoms'
     mkdir_p base_dir
 
     ['bazel-bin/javascript/atoms/fragments/is-displayed.js',
@@ -485,12 +485,12 @@ namespace :node do
   desc 'Build Node npm package'
   task :build do |_task, arguments|
     args = arguments.to_a.compact
-    Bazel.execute('build', args, '//javascript/node/selenium-webdriver')
+    Bazel.execute('build', args, '//javascript/selenium-webdriver')
   end
 
   task :'dry-run' do
     Bazel.execute('run', ['--stamp'],
-                  '//javascript/node/selenium-webdriver:selenium-webdriver.publish  -- --dry-run=true')
+                  '//javascript/selenium-webdriver:selenium-webdriver.publish  -- --dry-run=true')
   end
 
   desc 'Release Node npm package'
@@ -502,7 +502,7 @@ namespace :node do
     end
 
     puts 'Running Node package release...'
-    Bazel.execute('run', ['--config=release'], '//javascript/node/selenium-webdriver:selenium-webdriver.publish')
+    Bazel.execute('run', ['--config=release'], '//javascript/selenium-webdriver:selenium-webdriver.publish')
   end
 
   desc 'Release Node npm package'
@@ -515,8 +515,8 @@ namespace :node do
     puts 'Generating Node documentation'
     FileUtils.rm_rf('build/docs/api/javascript/')
     begin
-      sh 'npm install --prefix javascript/node/selenium-webdriver', verbose: true
-      sh 'npm run generate-docs --prefix javascript/node/selenium-webdriver', verbose: true
+      sh 'npm install --prefix javascript/selenium-webdriver', verbose: true
+      sh 'npm run generate-docs --prefix javascript/selenium-webdriver', verbose: true
     rescue StandardError => e
       puts "Node documentation generation contains errors; continuing... #{e.message}"
     end
@@ -527,8 +527,8 @@ namespace :node do
   desc 'Update JavaScript changelog'
   task :changelog do
     header = "## #{node_version}\n"
-    update_changelog(node_version, 'javascript', 'javascript/node/selenium-webdriver/',
-                     'javascript/node/selenium-webdriver/CHANGES.md', header)
+    update_changelog(node_version, 'javascript', 'javascript/selenium-webdriver/',
+                     'javascript/selenium-webdriver/CHANGES.md', header)
   end
 
   desc 'Update Node version'
@@ -537,17 +537,17 @@ namespace :node do
     nightly = "-nightly#{Time.now.strftime('%Y%m%d%H%M')}"
     new_version = updated_version(old_version, arguments[:version], nightly)
 
-    %w[javascript/node/selenium-webdriver/package.json javascript/node/selenium-webdriver/BUILD.bazel].each do |file|
+    %w[javascript/selenium-webdriver/package.json javascript/selenium-webdriver/BUILD.bazel].each do |file|
       text = File.read(file).gsub(old_version, new_version)
       File.open(file, 'w') { |f| f.puts text }
       @git.add(file)
     end
 
     # Update package-lock.json
-    Dir.chdir('javascript/node/selenium-webdriver') do
-      sh 'npm install --prefix javascript/node/selenium-webdriver', verbose: true
+    Dir.chdir('javascript/selenium-webdriver') do
+      sh 'npm install --prefix javascript/selenium-webdriver', verbose: true
     end
-    @git.add('javascript/node/selenium-webdriver/package-lock.json')
+    @git.add('javascript/selenium-webdriver/package-lock.json')
   end
 end
 
@@ -1127,7 +1127,7 @@ namespace :all do
      'dotnet/test/common/CustomDriverConfigs/',
      'dotnet/selenium-dotnet-version.bzl',
      'java/src/org/openqa/selenium/devtools/',
-     'javascript/node/selenium-webdriver/BUILD.bazel',
+     'javascript/selenium-webdriver/BUILD.bazel',
      'py/BUILD.bazel',
      'rb/lib/selenium/devtools/',
      'rb/Gemfile.lock',

common/devtools/BUILD.bazel

@@ -6,7 +6,7 @@ exports_files(
         "js_protocol.json",
     ],
     visibility = [
-        "//javascript/node/selenium-webdriver:__pkg__",
+        "//javascript/selenium-webdriver:__pkg__",
         "//py:__pkg__",
         "//rb/lib/selenium/devtools:__pkg__",
     ],

common/devtools/chromium/v132/BUILD.bazel

@@ -2,7 +2,7 @@ package(
     default_visibility = [
         "//dotnet/src/webdriver:__subpackages__",
         "//java/src/org/openqa/selenium/devtools:__subpackages__",
-        "//javascript/node/selenium-webdriver:__pkg__",
+        "//javascript/selenium-webdriver:__pkg__",
         "//py:__pkg__",
         "//rb/lib/selenium/devtools:__pkg__",
     ],

common/devtools/chromium/v133/BUILD.bazel

@@ -2,7 +2,7 @@ package(
     default_visibility = [
         "//dotnet/src/webdriver:__subpackages__",
         "//java/src/org/openqa/selenium/devtools:__subpackages__",
-        "//javascript/node/selenium-webdriver:__pkg__",
+        "//javascript/selenium-webdriver:__pkg__",
         "//py:__pkg__",
         "//rb/lib/selenium/devtools:__pkg__",
     ],

common/devtools/chromium/v134/BUILD.bazel

@@ -2,7 +2,7 @@ package(
     default_visibility = [
         "//dotnet/src/webdriver:__subpackages__",
         "//java/src/org/openqa/selenium/devtools:__subpackages__",
-        "//javascript/node/selenium-webdriver:__pkg__",
+        "//javascript/selenium-webdriver:__pkg__",
         "//py:__pkg__",
         "//rb/lib/selenium/devtools:__pkg__",
     ],

common/extensions/BUILD.bazel

@@ -11,7 +11,7 @@ filegroup(
         "//java/test/org/openqa/selenium/edge:__pkg__",
         "//java/test/org/openqa/selenium/environment:__pkg__",
         "//java/test/org/openqa/selenium/firefox:__pkg__",
-        "//javascript/node/selenium-webdriver:__subpackages__",
+        "//javascript/selenium-webdriver:__subpackages__",
         "//py:__pkg__",
         "//rb/spec:__subpackages__",
     ],
@@ -23,7 +23,7 @@ js_library(
         ":extensions",
     ],
     visibility = [
-        "//javascript/node/selenium-webdriver:__subpackages__",
+        "//javascript/selenium-webdriver:__subpackages__",
     ],
 )
 
@@ -35,7 +35,7 @@ exports_files(
     ],
     visibility = [
         "//java/test/org/openqa/selenium/firefox:__pkg__",
-        "//javascript/node/selenium-webdriver:__subpackages__",
+        "//javascript/selenium-webdriver:__subpackages__",
         "//py:__pkg__",
     ],
 )

common/manager/BUILD.bazel

@@ -3,7 +3,7 @@ package(
         "//dotnet/src/webdriver:__pkg__",
         "//dotnet/test/common:__pkg__",
         "//java/src/org/openqa/selenium/manager:__pkg__",
-        "//javascript/node/selenium-webdriver:__pkg__",
+        "//javascript/selenium-webdriver:__pkg__",
         "//py:__pkg__",
         "//rb:__pkg__",
     ],

common/src/web/BUILD.bazel

@@ -9,7 +9,7 @@ filegroup(
     visibility = [
         "//dotnet/test:__subpackages__",
         "//java/test/org/openqa/selenium/environment:__pkg__",
-        "//javascript/node/selenium-webdriver:__pkg__",
+        "//javascript/selenium-webdriver:__pkg__",
         "//py:__pkg__",
         "//rb/spec:__subpackages__",
     ],
@@ -21,6 +21,6 @@ js_library(
         ":web",
     ],
     visibility = [
-        "//javascript/node/selenium-webdriver:__subpackages__",
+        "//javascript/selenium-webdriver:__subpackages__",
     ],
 )

javascript/BUILD.bazel

@@ -1,6 +1,6 @@
 # BUILD file required (even if empty) so bazel can load .bzl extensions in this directory.
 
-load("@npm//javascript/node/selenium-webdriver:prettier/package_json.bzl", prettier_bin = "bin")
+load("@npm//javascript/selenium-webdriver:prettier/package_json.bzl", prettier_bin = "bin")
 
 alias(
     name = "pnpm",

javascript/atoms/BUILD.bazel

@@ -15,7 +15,7 @@ filegroup(
     visibility = [
         "//dotnet/test:__subpackages__",
         "//java/test/org/openqa/selenium/environment:__pkg__",
-        "//javascript/node/selenium-webdriver:__pkg__",
+        "//javascript/selenium-webdriver:__pkg__",
     ],
 )
 

javascript/atoms/fragments/BUILD.bazel

@@ -121,7 +121,7 @@ closure_fragment(
         "//java/src/org/openqa/selenium/remote:__pkg__",
         "//javascript/chrome-driver:__pkg__",
         "//javascript/ie-driver:__pkg__",
-        "//javascript/node/selenium-webdriver/lib/atoms:__pkg__",
+        "//javascript/selenium-webdriver/lib/atoms:__pkg__",
         "//py:__pkg__",
         "//rb/lib/selenium/webdriver/atoms:__pkg__",
     ],
@@ -200,7 +200,7 @@ closure_fragment(
         "//dotnet/src/webdriver:__pkg__",
         "//java/src/org/openqa/selenium/support/locators:__pkg__",
         "//javascript/chrome-driver:__pkg__",
-        "//javascript/node/selenium-webdriver/lib/atoms:__pkg__",
+        "//javascript/selenium-webdriver/lib/atoms:__pkg__",
         "//py:__pkg__",
         "//rb/lib/selenium/webdriver/atoms:__pkg__",
     ],

javascript/bidi-support/BUILD.bazel

@@ -4,8 +4,8 @@ package(default_visibility = [
     "//java/src/org/openqa/selenium/remote:__pkg__",
     "//javascript:__pkg__",
     "//javascript:__subpackages__",
-    "//javascript/node/selenium-webdriver:__pkg__",
-    "//javascript/node/selenium-webdriver/lib/atoms:__subpackages__",
+    "//javascript/selenium-webdriver:__pkg__",
+    "//javascript/selenium-webdriver/lib/atoms:__subpackages__",
 ])
 
 exports_files([

javascript/private/mocha_test.bzl

@@ -1,4 +1,4 @@
-load("@npm//javascript/node/selenium-webdriver:mocha/package_json.bzl", mocha_bin = "bin")
+load("@npm//javascript/selenium-webdriver:mocha/package_json.bzl", mocha_bin = "bin")
 
 _TIMEOUTS = {
     "small": "60000",

javascript/node/selenium-webdriver/BUILD.bazel → javascript/selenium-webdriver/BUILD.bazel

@@ -2,8 +2,8 @@ load("@aspect_bazel_lib//lib:copy_to_bin.bzl", "copy_to_bin")
 load("@aspect_rules_js//js:defs.bzl", "js_library")
 load("@aspect_rules_js//npm:defs.bzl", "npm_package")
 load("@npm//:defs.bzl", "npm_link_all_packages")
-load("@npm//javascript/node/selenium-webdriver:eslint/package_json.bzl", eslint_bin = "bin")
-load("@npm//javascript/node/selenium-webdriver:prettier/package_json.bzl", prettier_bin = "bin")
+load("@npm//javascript/selenium-webdriver:eslint/package_json.bzl", eslint_bin = "bin")
+load("@npm//javascript/selenium-webdriver:prettier/package_json.bzl", prettier_bin = "bin")
 load("@rules_pkg//pkg:pkg.bzl", "pkg_tar")
 load("//common:defs.bzl", "copy_file")
 load("//javascript:defs.bzl", "mocha_test")
@@ -56,11 +56,11 @@ npm_package(
         ":manager-macos",
         ":manager-windows",
         ":prod-src-files",
-        "//javascript/node/selenium-webdriver/lib/atoms:bidi-mutation-listener",
-        "//javascript/node/selenium-webdriver/lib/atoms:find-elements",
-        "//javascript/node/selenium-webdriver/lib/atoms:get_attribute",
-        "//javascript/node/selenium-webdriver/lib/atoms:is_displayed",
-        "//javascript/node/selenium-webdriver/lib/atoms:mutation-listener",
+        "//javascript/selenium-webdriver/lib/atoms:bidi-mutation-listener",
+        "//javascript/selenium-webdriver/lib/atoms:find-elements",
+        "//javascript/selenium-webdriver/lib/atoms:get_attribute",
+        "//javascript/selenium-webdriver/lib/atoms:is_displayed",
+        "//javascript/selenium-webdriver/lib/atoms:mutation-listener",
     ],
     package = "selenium-webdriver",
     publishable = True,