Merge pull request #1465 from jwhitlock/mapbox-js-to-gl-1456

Switch the contribution map to mapbox-gl 1.3.0

.gitattributes

@@ -1,3 +1,12 @@
 # Mark files that are generated as linguist-generated to encourage GitHub
 # to not count them and not show their diffs in PRs
 requirements.txt linguist-generated=true
+
+# Bundles are compressed versions of other files
+ichnaea/content/static/css/bundle-*.css linguist-generated=true
+ichnaea/content/static/js/bundle-*.css linguist-generated=true
+
+# Third-party libraries hidden by default
+ichnaea/content/static/css/mapbox-gl-geocoder.css linguist-generated=true
+ichnaea/content/static/css/mapbox-gl.css linguist-generated=true
+ichnaea/content/static/js/mapbox-gl-unminified.js linguist-generated=true

Makefile

@@ -42,8 +42,8 @@ default:
 	@echo "  testcoverage     - run unit tests with coverage report"
 	@echo "  testshell        - open a shell in the test environment"
 	@echo "  docs             - generate Sphinx HTML documentation, including API docs"
-	@echo "  buildjs          - generate js static assets"
-	@echo "  buildcss         - generate css static assets"
+	@echo "  assets           - build all generated static assets"
+	@echo "  clean-assets     - remove generated static assets"
 	@echo "  update-vendored  - re-download vendor source and test data"
 	@echo "  update-reqs      - regenerate Python requirements"
 	@echo ""
@@ -102,13 +102,13 @@ testshell: my.env .docker-build
 docs: my.env .docker-build
 	${DC} run --rm --no-deps app shell ./docker/run_build_docs.sh
 
-.PHONY: buildjs
-buildjs: my.env .docker-build
-	${DC} run --rm --user ${ICHNAEA_UID} node make -f node.make js
+.PHONY: assets
+assets: my.env .docker-build
+	${DC} run --rm --user ${ICHNAEA_UID} node make -f node.make
 
-.PHONY: buildcss
-buildcss: my.env .docker-build
-	${DC} run --rm --user ${ICHNAEA_UID} node make -f node.make css
+.PHONY: clean-assets
+clean-assets: my.env .docker-build
+	${DC} run --rm --user ${ICHNAEA_UID} node make -f node.make clean
 
 .PHONY: lint
 lint: my.env .docker-build

docker/node/Dockerfile

@@ -20,12 +20,9 @@ CMD ["bash"]
 
 COPY --chown=node:node ./package.json ./npm-shrinkwrap.json /node/
 RUN npm install --no-save -d /node
-RUN npm dedupe
+# RUN npm dedupe # Broken with npm 7.0.15, see #1467
 RUN npm shrinkwrap
 
-WORKDIR /node/node_modules/mapbox.js
-RUN npm install
-
 ENV PATH=$PATH:/node/node_modules/.bin/
 
 WORKDIR /app