Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

dependencies: Remove PhantomJS from development environment.

This commit is contained in:
Tim Abbott 2020-08-30 15:14:06 -07:00
parent 992c6126a8
commit 2f5f5d7749
6 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.browserslistrc
View File

@ -3,4 +3,3 @@
last 2 versions last 2 versions
Firefox ESR Firefox ESR
not dead not dead
Chrome 26 # similar to PhantomJS

1
.eslintrc.json
View File

@ -361,6 +361,7 @@
}, },
"rules": { "rules": {
// Don’t require ES features that PhantomJS doesn’t support // Don’t require ES features that PhantomJS doesn’t support
// TODO: Toggle these settings now that we don't use PhantomJS
"no-var": "off", "no-var": "off",
"object-shorthand": "off", "object-shorthand": "off",
"prefer-arrow-callback": "off" "prefer-arrow-callback": "off"

4
docs/testing/testing-with-node.md
View File

@ -44,8 +44,8 @@ A good first test to read is
## How the node tests work ## How the node tests work
Unlike the [casper unit tests](../testing/testing-with-casper.md), Unlike the [Puppeteer unit tests](../testing/testing-with-casper.md),
which use the `phantomjs` browser connected to a running Zulip which use a headless Chromium browser connected to a running Zulip
development server, our node unit tests don't have a browser, don't 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 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 handful of tests use the `jsdom` library for this purpose) because

1
package.json
View File

@ -96,7 +96,6 @@
"eslint-plugin-empty-returns": "^1.0.2", "eslint-plugin-empty-returns": "^1.0.2",
"jsdom": "^16.1.0", "jsdom": "^16.1.0",
"nyc": "^15.0.0", "nyc": "^15.0.0",
"phantomjs-prebuilt": "^2.1.16",
"prettier": "^2.0.5", "prettier": "^2.0.5",
"puppeteer": "^5.2.0", "puppeteer": "^5.2.0",
"source-map": "^0.6.1", "source-map": "^0.6.1",

8
tools/lib/provision.py
View File

@ -124,7 +124,7 @@ COMMON_DEPENDENCIES = [
"puppet", # Used by lint (`puppet parser validate`) "puppet", # Used by lint (`puppet parser validate`)
"gettext", # Used by makemessages i18n "gettext", # Used by makemessages i18n
"transifex-client", # Needed to sync translations from transifex "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 "moreutils", # Used for sponge command
"unzip", # Needed for Slack import "unzip", # Needed for Slack import
"crudini", # Used for shell tooling w/ zulip.conf "crudini", # Used for shell tooling w/ zulip.conf
@ -149,7 +149,6 @@ UBUNTU_COMMON_APT_DEPENDENCIES = COMMON_DEPENDENCIES + [
"hunspell-en-us", "hunspell-en-us",
"puppet-lint", "puppet-lint",
"netcat", # Used for flushing memcached "netcat", # Used for flushing memcached
"libfontconfig1", # Required by phantomjs
"default-jre-headless", # Required by vnu-jar "default-jre-headless", # Required by vnu-jar
] + THUMBOR_VENV_DEPENDENCIES ] + THUMBOR_VENV_DEPENDENCIES
@ -158,11 +157,6 @@ COMMON_YUM_DEPENDENCIES = COMMON_DEPENDENCIES + [
"hunspell-en-US", "hunspell-en-US",
"rubygem-puppet-lint", "rubygem-puppet-lint",
"nmap-ncat", "nmap-ncat",
"fontconfig", # phantomjs dependencies from here until libstdc++
"freetype",
"freetype-devel",
"fontconfig-devel",
"libstdc++",
] + YUM_THUMBOR_VENV_DEPENDENCIES ] + YUM_THUMBOR_VENV_DEPENDENCIES
BUILD_PGROONGA_FROM_SOURCE = False BUILD_PGROONGA_FROM_SOURCE = False

2
version.py
View File

@ -44,4 +44,4 @@ API_FEATURE_LEVEL = 32
# historical commits sharing the same major version, in which case a # historical commits sharing the same major version, in which case a
# minor version bump suffices. # minor version bump suffices.
PROVISION_VERSION = '99.0' PROVISION_VERSION = '100.0'