diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 07babda2..f349b87c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -41,8 +41,10 @@ jobs: - run: yarn test - run: | node_modules/.bin/tsc $GITHUB_WORKSPACE/__tests__/chromedriver.ts - node_modules/.bin/ncc build $GITHUB_WORKSPACE/__tests__/chromedriver.js -o $GITHUB_WORKSPACE/__tests__ - rm -rf node_modules + # Cannot find chromedriver when using ncc. + # see https://github.com/nanasess/setup-chromedriver/issues/303 + # node_modules/.bin/ncc build $GITHUB_WORKSPACE/__tests__/chromedriver.js -o $GITHUB_WORKSPACE/__tests__ + # rm -rf node_modules - if: matrix.chrome_version != 'current' env: CHROME_VERSION: ${{ matrix.chrome_version }} @@ -72,7 +74,7 @@ jobs: export DISPLAY=:99 chromedriver --url-base=/wd/hub & sudo Xvfb -ac :99 -screen 0 1280x1024x24 > /dev/null 2>&1 & # disable headless mode - node $GITHUB_WORKSPACE/__tests__/index.js + node $GITHUB_WORKSPACE/__tests__/chromedriver.js test_default_version: runs-on: ${{ matrix.os }} @@ -95,8 +97,10 @@ jobs: - run: yarn test - run: | node_modules/.bin/tsc $GITHUB_WORKSPACE/__tests__/chromedriver.ts - node_modules/.bin/ncc build $GITHUB_WORKSPACE/__tests__/chromedriver.js -o $GITHUB_WORKSPACE/__tests__ - rm -rf node_modules + # Cannot find chromedriver when using ncc. + # see https://github.com/nanasess/setup-chromedriver/issues/303 + # node_modules/.bin/ncc build $GITHUB_WORKSPACE/__tests__/chromedriver.js -o $GITHUB_WORKSPACE/__tests__ + # rm -rf node_modules - uses: ./ if: matrix.branch == 'now' - uses: nanasess/setup-chromedriver@master @@ -107,4 +111,4 @@ jobs: export DISPLAY=:99 chromedriver --url-base=/wd/hub & sudo Xvfb -ac :99 -screen 0 1280x1024x24 > /dev/null 2>&1 & # disable headless mode - node $GITHUB_WORKSPACE/__tests__/index.js + node $GITHUB_WORKSPACE/__tests__/chromedriver.js diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index fc3ca8da..43b3ec27 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -35,8 +35,10 @@ jobs: - run: yarn test - run: | node_modules/.bin/tsc $GITHUB_WORKSPACE/__tests__/chromedriver.ts - node_modules/.bin/ncc build $GITHUB_WORKSPACE/__tests__/chromedriver.js -o $GITHUB_WORKSPACE/__tests__ - rm -rf node_modules + # Cannot find chromedriver when using ncc. + # see https://github.com/nanasess/setup-chromedriver/issues/303 + # node_modules/.bin/ncc build $GITHUB_WORKSPACE/__tests__/chromedriver.js -o $GITHUB_WORKSPACE/__tests__ + # rm -rf node_modules shell: bash - shell: pwsh run: | @@ -63,7 +65,7 @@ jobs: - name: setup run: | chromedriver --url-base=/wd/hub & - node "$Env:GITHUB_WORKSPACE\__tests__\index.js" + node "$Env:GITHUB_WORKSPACE\__tests__\chromedriver.js" test_default_version: runs-on: ${{ matrix.os }} @@ -84,8 +86,10 @@ jobs: - run: yarn test - run: | node_modules/.bin/tsc $GITHUB_WORKSPACE/__tests__/chromedriver.ts - node_modules/.bin/ncc build $GITHUB_WORKSPACE/__tests__/chromedriver.js -o $GITHUB_WORKSPACE/__tests__ - rm -rf node_modules + # Cannot find chromedriver when using ncc. + # see https://github.com/nanasess/setup-chromedriver/issues/303 + # node_modules/.bin/ncc build $GITHUB_WORKSPACE/__tests__/chromedriver.js -o $GITHUB_WORKSPACE/__tests__ + # rm -rf node_modules shell: bash - uses: ./ if: matrix.branch == 'now' @@ -94,4 +98,4 @@ jobs: - name: setup run: | chromedriver --url-base=/wd/hub & - node "$Env:GITHUB_WORKSPACE\__tests__\index.js" + node "$Env:GITHUB_WORKSPACE\__tests__\chromedriver.js" diff --git a/package.json b/package.json index 61c3d26c..d2d2c472 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,7 @@ "devDependencies": { "@types/jest": "^27.4.1", "@types/node": "^20.12.11", - "@types/selenium-webdriver": "^4.1.21", + "@types/selenium-webdriver": "^4.1.22", "@types/semver": "^7.5.8", "@types/yauzl": "^2.10.3", "@vercel/ncc": "^0.38.1", @@ -42,7 +42,7 @@ "jest": "^27.5.1", "jest-circus": "^29.7.0", "prettier": "^3.2.5", - "selenium-webdriver": "^4.17.0", + "selenium-webdriver": "^4.20.0", "ts-jest": "^27.1.3", "ts-node": "^10.9.2", "typescript": "^4.9.5" diff --git a/yarn.lock b/yarn.lock index 12bbebca..24af9812 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1185,10 +1185,10 @@ resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.4.4.tgz#5d9b63132df54d8909fce1c3f8ca260fdd693e17" integrity sha512-ReVR2rLTV1kvtlWFyuot+d1pkpG2Fw/XKE3PDAdj57rbM97ttSp9JZ2UsP+2EHTylra9cUf6JA7tGwW1INzUrA== -"@types/selenium-webdriver@^4.1.21": - version "4.1.21" - resolved "https://registry.yarnpkg.com/@types/selenium-webdriver/-/selenium-webdriver-4.1.21.tgz#79fe31faf9953a4143c3e32944d98d5146bbe185" - integrity sha512-QGURnImvxYlIQz5DVhvHdqpYNLBjhJ2Vm+cnQI2G9QZzkWlZm0LkLcvDcHp+qE6N2KBz4CeuvXgPO7W3XQ0Tyw== +"@types/selenium-webdriver@^4.1.22": + version "4.1.22" + resolved "https://registry.yarnpkg.com/@types/selenium-webdriver/-/selenium-webdriver-4.1.22.tgz#344519b90727eb713e1ce6d2e0198eb0b4f8f316" + integrity sha512-MCL4l7q8dwxejr2Q2NXLyNwHWMPdlWE0Kpn6fFwJtvkJF7PTkG5jkvbH/X1IAAQxgt/L1dA8u2GtDeekvSKvOA== dependencies: "@types/ws" "*" @@ -3237,14 +3237,14 @@ saxes@^5.0.1: dependencies: xmlchars "^2.2.0" -selenium-webdriver@^4.17.0: - version "4.17.0" - resolved "https://registry.yarnpkg.com/selenium-webdriver/-/selenium-webdriver-4.17.0.tgz#f6c93a9df3e0543df7dc2329d81968af42845a7f" - integrity sha512-e2E+2XBlGepzwgFbyQfSwo9Cbj6G5fFfs9MzAS00nC99EewmcS2rwn2MwtgfP7I5p1e7DYv4HQJXtWedsu6DvA== +selenium-webdriver@^4.20.0: + version "4.20.0" + resolved "https://registry.yarnpkg.com/selenium-webdriver/-/selenium-webdriver-4.20.0.tgz#14941ab4a59e8956a5e4b4491a8ba2bd6619d1ac" + integrity sha512-s/G44lGQ1xB3tmtX6NNPomlkpL6CxLdmAvp/AGWWwi4qv5Te1+qji7tPSyr6gyuoPpdYiof1rKnWe3luy0MrYA== dependencies: jszip "^3.10.1" - tmp "^0.2.1" - ws ">=8.14.2" + tmp "^0.2.3" + ws ">=8.16.0" semver@7.x, semver@^7.3.2, semver@^7.5.3, semver@^7.6.2: version "7.6.2" @@ -3439,12 +3439,10 @@ throat@^6.0.1: resolved "https://registry.yarnpkg.com/throat/-/throat-6.0.1.tgz#d514fedad95740c12c2d7fc70ea863eb51ade375" integrity sha512-8hmiGIJMDlwjg7dlJ4yKGLK8EsYqKgPWbG3b4wjJddKNwc7N7Dpn08Df4szr/sZdMVeOstrdYSsqzX6BYbcB+w== -tmp@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.1.tgz#8457fc3037dcf4719c251367a1af6500ee1ccf14" - integrity sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ== - dependencies: - rimraf "^3.0.0" +tmp@^0.2.3: + version "0.2.3" + resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.3.tgz#eb783cc22bc1e8bebd0671476d46ea4eb32a79ae" + integrity sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w== tmpl@1.0.5: version "1.0.5" @@ -3724,10 +3722,10 @@ write-file-atomic@^4.0.2: imurmurhash "^0.1.4" signal-exit "^3.0.7" -ws@>=8.14.2: - version "8.14.2" - resolved "https://registry.yarnpkg.com/ws/-/ws-8.14.2.tgz#6c249a806eb2db7a20d26d51e7709eab7b2e6c7f" - integrity sha512-wEBG1ftX4jcglPxgFCMJmZ2PLtSbJ2Peg6TmpJFTbe9GZYOQCDPdMYu/Tm0/bGZkw8paZnJY45J4K2PZrLYq8g== +ws@>=8.16.0: + version "8.17.0" + resolved "https://registry.yarnpkg.com/ws/-/ws-8.17.0.tgz#d145d18eca2ed25aaf791a183903f7be5e295fea" + integrity sha512-uJq6108EgZMAl20KagGkzCKfMEjxmKvZHG7Tlq0Z6nOky7YF7aq4mOx6xK8TJ/i1LeK4Qus7INktacctDgY8Ow== ws@^7.4.6: version "7.5.7"