Merge pull request #1104 from osmlab/prerelease

v3.5.4

.travis.yml

@@ -10,3 +10,4 @@ cache:
     - node_modules
 script:
   - yarn run build
+  - yarn test --maxWorkers=2

CHANGELOG.md

@@ -7,7 +7,36 @@ The format is based on
 This project adheres to
 [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
-## [v3.5.3] - 2020-01-21
+## [v3.5.4] - 2020-02-07
+### Added
+- Ability to designate task property as OSM id in challenge creation
+- Ability to setup preferred task tags during challenge creation
+- Reviewer-related stats on User Metrics page
+- Proper links for challenge names on Find Challenges page (#997)
+- Past Progress historical progress widget for challenges in Create & Manage
+- Ability to filter tasks by id, mapper, and reviewer in Create & Manage
+- Option to view tasks actively locked by a mapper in read-only preview mode
+- Default to excluding task reviews assigned to others on Task Review page
+- Support for basic point/marker "simplestyles" task-feature styling
+- Dedicated sign-in page if user navigates to page requiring sign-in
+- Various app-wide color and styling updates and fixes
+- Minor speed-up to loading of challenge dashboard in Create & Manage
+- [internal] Upgrade various package dependencies
+
+### Fixed
+- Incorrect display of 'view by priority' link on Project Detail page
+- Occasional discrepency in count of tasks completed together (#1086)
+- Erroneous treatment of en-US locale as invalid in User Settings
+- Failure during display of Markdown containing explicit line-breaks
+- Negative timers during task build or rebuild
+- Erroneous option to sort tasks by feature columns, which is not supported
+- Incorrect treatment of Current Month in user metrics
+- Occasional wrong result when searching for certain users (#1061)
+- Potential task loop when skipping tasks at a priority boundary
+- [internal] Update unit tests
+
+
+## [v3.5.3] - 2020-01-22
 ### Added
 - Support for `out center` in Overpass queries by @Zverik
 - Option for project managers to export CSV of tasks in project

README.md

@@ -185,27 +185,6 @@ Unit tests are built with [Jest](https://facebook.github.io/jest/) +
 
 `yarn test` to run them in watch mode.
 
-## End-to-End Tests
-
-> Note: End-to-End tests are temporarily disabled as the Chimp framework is not
-> compatible with Node 10 LTS.
-
-End-to-end tests are built with [Chimp](https://chimp.readme.io/), which
-combines [Webdriver.io](http://webdriver.io/guide.html) for Selenium +
-[Cucumber](https://cucumber.io/docs/reference) and
-[Jasmine](https://jasmine.github.io/api/3.0/global) for tests.
-
-Prior to running tests locally, you'll need to tell Chimp the URL to your
-MR3 app. Copy `chimp.example.js` to `chimp.js`, edit the file and modify the
-`mr3URL` setting. You only need to do this once.
-
-Then:
-`yarn e2e` to run the tests, or `yarn e2e --watch` to enter watch mode and only
-run tests with a `@watch` tag (useful when working on new tests).
-
-[Sauce Labs](https://saucelabs.com) has also graciously provided us with free
-access to their cross-browser testing platform.
-
 ## CSS Styling and Naming
 
 We are currently in transition between the old styling that used the

package.json

@@ -1,13 +1,13 @@
 {
   "name": "maproulette3",
-  "version": "3.5.3",
+  "version": "3.5.4",
   "private": true,
   "dependencies": {
     "@mapbox/geo-viewport": "^0.4.0",
     "@mapbox/geojsonhint": "^2.0.1",
-    "@nivo/bar": "^0.52.1",
-    "@nivo/line": "^0.33.0",
-    "@nivo/radar": "^0.33.0",
+    "@nivo/bar": "^0.61.1",
+    "@nivo/line": "^0.61.1",
+    "@nivo/radar": "^0.61.1",
     "@turf/bbox": "^5.1.5",
     "@turf/bbox-polygon": "^5.1.5",
     "@turf/boolean-disjoint": "^5.1.5",
@@ -65,7 +65,7 @@
     "react-redux": "^5.0.5",
     "react-responsive": "^4.1.0",
     "react-router-dom": "^4.2.2",
-    "react-scripts": "3.2.0",
+    "react-scripts": "3.3.1",
     "react-share": "^1.16.0",
     "react-syntax-highlighter": "^10.3.0",
     "react-table": "^6.7.6",
@@ -113,7 +113,6 @@
     "start": "npm-run-all -p update-layers watch-postcss start-js",
     "build": "yarn run build-intl && yarn run update-layers && yarn run build-postcss && react-scripts build",
     "test": "react-scripts test",
-    "e2e": "yarn run chimp",
     "eject": "react-scripts eject"
   },
   "browserslist": [