diff --git a/.browserslistrc b/.browserslistrc index 2e9f7a069c..0d7bbadee6 100644 --- a/.browserslistrc +++ b/.browserslistrc @@ -3,4 +3,3 @@ last 2 versions Firefox ESR not dead -Chrome 26 # similar to PhantomJS diff --git a/.eslintrc.json b/.eslintrc.json index 21378981dd..a5ba6a6399 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -361,6 +361,7 @@ }, "rules": { // Don’t require ES features that PhantomJS doesn’t support + // TODO: Toggle these settings now that we don't use PhantomJS "no-var": "off", "object-shorthand": "off", "prefer-arrow-callback": "off" diff --git a/docs/testing/testing-with-node.md b/docs/testing/testing-with-node.md index 287f4dbfec..2e4ad87ae1 100644 --- a/docs/testing/testing-with-node.md +++ b/docs/testing/testing-with-node.md @@ -44,8 +44,8 @@ A good first test to read is ## How the node tests work -Unlike the [casper unit tests](../testing/testing-with-casper.md), -which use the `phantomjs` browser connected to a running Zulip +Unlike the [Puppeteer unit tests](../testing/testing-with-casper.md), +which use a headless Chromium browser connected to a running Zulip development server, our node unit tests don't have a browser, don't talk to a server, and generally don't use a complete virtual DOM (a handful of tests use the `jsdom` library for this purpose) because diff --git a/package.json b/package.json index 1cec8b8927..b31efa84e2 100644 --- a/package.json +++ b/package.json @@ -96,7 +96,6 @@ "eslint-plugin-empty-returns": "^1.0.2", "jsdom": "^16.1.0", "nyc": "^15.0.0", - "phantomjs-prebuilt": "^2.1.16", "prettier": "^2.0.5", "puppeteer": "^5.2.0", "source-map": "^0.6.1", diff --git a/tools/lib/provision.py b/tools/lib/provision.py index 40f3610297..59ada7827b 100755 --- a/tools/lib/provision.py +++ b/tools/lib/provision.py @@ -124,7 +124,7 @@ COMMON_DEPENDENCIES = [ "puppet", # Used by lint (`puppet parser validate`) "gettext", # Used by makemessages i18n "transifex-client", # Needed to sync translations from transifex - "curl", # Used for fetching PhantomJS as wget occasionally fails on redirects + "curl", # Used for testing our API documentation "moreutils", # Used for sponge command "unzip", # Needed for Slack import "crudini", # Used for shell tooling w/ zulip.conf @@ -149,7 +149,6 @@ UBUNTU_COMMON_APT_DEPENDENCIES = COMMON_DEPENDENCIES + [ "hunspell-en-us", "puppet-lint", "netcat", # Used for flushing memcached - "libfontconfig1", # Required by phantomjs "default-jre-headless", # Required by vnu-jar ] + THUMBOR_VENV_DEPENDENCIES @@ -158,11 +157,6 @@ COMMON_YUM_DEPENDENCIES = COMMON_DEPENDENCIES + [ "hunspell-en-US", "rubygem-puppet-lint", "nmap-ncat", - "fontconfig", # phantomjs dependencies from here until libstdc++ - "freetype", - "freetype-devel", - "fontconfig-devel", - "libstdc++", ] + YUM_THUMBOR_VENV_DEPENDENCIES BUILD_PGROONGA_FROM_SOURCE = False diff --git a/version.py b/version.py index 569b21f00d..be167bc3fa 100644 --- a/version.py +++ b/version.py @@ -44,4 +44,4 @@ API_FEATURE_LEVEL = 32 # historical commits sharing the same major version, in which case a # minor version bump suffices. -PROVISION_VERSION = '99.0' +PROVISION_VERSION = '100.0'