diff --git a/.github/workflows/release-generic-actors.yaml b/.github/workflows/release-generic-actors.yaml index 1ef7f6409c..ac88649af4 100644 --- a/.github/workflows/release-generic-actors.yaml +++ b/.github/workflows/release-generic-actors.yaml @@ -60,39 +60,39 @@ jobs: matrix: settings: - actor: web-scraper - stable-version: 3.0 + stable-version: '3.0' stable-build-tag: version-3 - development-version: 0.0 + development-version: '0.0' development-build-tag: development should-build: ${{ github.event.inputs.web-scraper }} - actor: cheerio-scraper - stable-version: 3.0 + stable-version: '3.0' stable-build-tag: version-3 - development-version: 0.0 + development-version: '0.0' development-build-tag: development should-build: ${{ github.event.inputs.cheerio-scraper }} - actor: playwright-scraper - stable-version: 1.0 + stable-version: '1.0' stable-build-tag: version-1 - development-version: 0.0 + development-version: '0.0' development-build-tag: development should-build: ${{ github.event.inputs.playwright-scraper }} - actor: puppeteer-scraper - stable-version: 3.0 + stable-version: '3.0' stable-build-tag: version-3 - development-version: 0.0 + development-version: '0.0' development-build-tag: development should-build: ${{ github.event.inputs.puppeteer-scraper }} - actor: jsdom-scraper - stable-version: 0.1 + stable-version: '0.1' stable-build-tag: latest - development-version: 0.0 + development-version: '0.0' development-build-tag: development should-build: ${{ github.event.inputs.jsdom-scraper }} - actor: camoufox-scraper - stable-version: 3.0 + stable-version: '3.0' stable-build-tag: version-3 - development-version: 0.0 + development-version: '0.0' development-build-tag: development should-build: ${{ github.event.inputs.camoufox-scraper }} steps: @@ -108,14 +108,14 @@ jobs: if: matrix.settings.should-build == 'true' run: | if [ "${{ github.event.inputs.build-channel }}" = "stable" ]; then - echo "version=${{ matrix.settings.stable-version }}\n" >> $GITHUB_ENV - echo "build-tag=${{ matrix.settings.stable-build-tag }}\n" >> $GITHUB_ENV + echo "version=${{ matrix.settings.stable-version }}" >> $GITHUB_ENV + echo "build-tag=${{ matrix.settings.stable-build-tag }}" >> $GITHUB_ENV elif [ "${{ github.event.inputs.build-channel }}" = "development" ]; then - echo "version=${{ matrix.settings.development-version }}\n" >> $GITHUB_ENV - echo "build-tag=${{ matrix.settings.development-build-tag }}\n" >> $GITHUB_ENV + echo "version=${{ matrix.settings.development-version }}" >> $GITHUB_ENV + echo "build-tag=${{ matrix.settings.development-build-tag }}" >> $GITHUB_ENV else - echo "version=${{ github.event.inputs.version }}\n" >> $GITHUB_ENV - echo "build-tag=${{ github.event.inputs.build-tag }}\n" >> $GITHUB_ENV + echo "version=${{ github.event.inputs.version }}" >> $GITHUB_ENV + echo "build-tag=${{ github.event.inputs.build-tag }}" >> $GITHUB_ENV fi - name: Build ${{ matrix.settings.actor }} @@ -123,6 +123,6 @@ jobs: if: matrix.settings.should-build == 'true' with: token: ${{ secrets.APIFY_ACTOR_BUILD_TOKEN }} - build-tag: ${{ steps.calculate-versions.outputs.build-tag }} - version: ${{ steps.calculate-versions.outputs.version }} + build-tag: ${{ env.build-tag }} + version: ${{ env.version }} working-directory: packages/actor-scraper/${{ matrix.settings.actor }} diff --git a/package-lock.json b/package-lock.json index a21b74fe3e..6d01bcd765 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5333,29 +5333,6 @@ "node": ">=8" } }, - "node_modules/camoufox-js": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/camoufox-js/-/camoufox-js-0.3.3.tgz", - "integrity": "sha512-m0c5P9f+T5UmGfPS055yRRFDccgrT73YC3sQgPcYvmmHSNdluQqE6VI0KmuGTpN1YBKdZghdEPaCR4oxXtTzIA==", - "license": "ISC", - "dependencies": { - "adm-zip": "^0.5.16", - "commander": "^13.1.0", - "fingerprint-generator": "^2.1.62", - "impit": "^0.2.1", - "js-yaml": "^4.1.0", - "language-tags": "^2.0.1", - "maxmind": "^4.3.24", - "playwright-core": "^1.52.0", - "progress": "^2.0.3", - "sqlite3": "^5.1.7", - "ua-parser-js": "^2.0.2", - "xml2js": "^0.6.2" - }, - "bin": { - "camoufox-js": "dist/__main__.js" - } - }, "node_modules/caniuse-lite": { "version": "1.0.30001715", "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001715.tgz", @@ -20029,7 +20006,7 @@ "@crawlee/playwright": "^3.13.2", "@crawlee/utils": "^3.13.2", "apify": "^3.2.6", - "camoufox-js": "^0.3.0", + "camoufox-js": "^0.3.4", "idcac-playwright": "^0.1.3", "playwright": "*" }, @@ -20040,6 +20017,68 @@ "typescript": "~5.8.0" } }, + "packages/actor-scraper/camoufox-scraper/node_modules/camoufox-js": { + "version": "0.3.4", + "resolved": "https://registry.npmjs.org/camoufox-js/-/camoufox-js-0.3.4.tgz", + "integrity": "sha512-gxn23Gyh2Esaf7Uwdop2m0QGMwEJEL7J2tIfNYjkYNXtidu/8FZyz/1/KeV1lx1aa7Xgv4pwGawn4upUktcOHw==", + "license": "ISC", + "dependencies": { + "adm-zip": "^0.5.16", + "commander": "^13.1.0", + "fingerprint-generator": "^2.1.66", + "impit": "^0.2.1", + "js-yaml": "^4.1.0", + "language-tags": "^2.0.1", + "maxmind": "^4.3.24", + "playwright-core": "^1.52.0", + "progress": "^2.0.3", + "sqlite3": "^5.1.7", + "ua-parser-js": "^2.0.2", + "xml2js": "^0.6.2" + }, + "bin": { + "camoufox-js": "dist/__main__.js" + } + }, + "packages/actor-scraper/camoufox-scraper/node_modules/fingerprint-generator": { + "version": "2.1.66", + "resolved": "https://registry.npmjs.org/fingerprint-generator/-/fingerprint-generator-2.1.66.tgz", + "integrity": "sha512-2CvoY+OPcCOWkoIMQim80uNH+ED1+2rM9QXIcSih7ovBMLOmyr3Sp9IOtfccd05QlGDzulU2M9Oav8jOgTlCBA==", + "license": "Apache-2.0", + "dependencies": { + "generative-bayesian-network": "^2.1.66", + "header-generator": "^2.1.66", + "tslib": "^2.4.0" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "packages/actor-scraper/camoufox-scraper/node_modules/generative-bayesian-network": { + "version": "2.1.66", + "resolved": "https://registry.npmjs.org/generative-bayesian-network/-/generative-bayesian-network-2.1.66.tgz", + "integrity": "sha512-gbBsyaaEJj/LHp3473TQrMDdcKiRzI8Sn2CbcG/lwONZkp0n9/ChC1mjzcbZQtHHCuqjn+JouSSbzLeepUMbuw==", + "license": "Apache-2.0", + "dependencies": { + "adm-zip": "^0.5.9", + "tslib": "^2.4.0" + } + }, + "packages/actor-scraper/camoufox-scraper/node_modules/header-generator": { + "version": "2.1.66", + "resolved": "https://registry.npmjs.org/header-generator/-/header-generator-2.1.66.tgz", + "integrity": "sha512-g0jd79o0CyzyK0Jega4pAG1eJhykhPNfBLpOnUINtX2YkToVvRSBZ+B2wtmIjqwKHXK8DNWxylKuXnZmLs1yMQ==", + "license": "Apache-2.0", + "dependencies": { + "browserslist": "^4.21.1", + "generative-bayesian-network": "^2.1.66", + "ow": "^0.28.1", + "tslib": "^2.4.0" + }, + "engines": { + "node": ">=16.0.0" + } + }, "packages/actor-scraper/cheerio-scraper": { "name": "actor-cheerio-scraper", "version": "3.1.0", diff --git a/packages/actor-scraper/camoufox-scraper/Dockerfile b/packages/actor-scraper/camoufox-scraper/Dockerfile index b70491bddf..e93eb4bcf1 100644 --- a/packages/actor-scraper/camoufox-scraper/Dockerfile +++ b/packages/actor-scraper/camoufox-scraper/Dockerfile @@ -24,6 +24,7 @@ RUN npm --quiet set progress=false \ && npm --version \ && rm -r ~/.npm +ENV PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=0 RUN npm run get-binaries COPY --chown=myuser . ./ diff --git a/packages/actor-scraper/camoufox-scraper/package.json b/packages/actor-scraper/camoufox-scraper/package.json index 70e6c4263f..3f93771cd4 100644 --- a/packages/actor-scraper/camoufox-scraper/package.json +++ b/packages/actor-scraper/camoufox-scraper/package.json @@ -10,7 +10,7 @@ "@crawlee/playwright": "^3.13.2", "@crawlee/utils": "^3.13.2", "apify": "^3.2.6", - "camoufox-js": "^0.3.0", + "camoufox-js": "^0.3.4", "idcac-playwright": "^0.1.3", "playwright": "*" },