Merge pull request #384 from eyelidlessness/prerelease/3-0-5/dependen…

…cies Prepare for 3.0.5
enketo · Feb 9, 2022 · 5e298e5 · 5e298e5
2 parents fcfb346 + c38c11d
commit 5e298e5
Show file tree

Hide file tree

Showing 73 changed files with 2,648 additions and 2,064 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,21 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+[3.0.5] - 2022-02-08
+---------------------
+
+##### Changed
+
+- [#373](https://github.com/enketo/enketo-express/pull/373) Fix: not all signature images are uploaded in offline-capable forms
+- [#380](https://github.com/enketo/enketo-express/pull/380) Fix: ensure form_logo.png is included when present in media mapping
+- [#230](https://github.com/enketo/enketo-express/pull/230) Clearer recommendation phrasing in English translation for loading errors
+- [#382](https://github.com/enketo/enketo-express/pulls/382) Update offline script version at build time
+- Upgraded to [enketo-core 6.0.4](https://github.com/enketo/enketo-core/blob/master/CHANGELOG.md#604---2022-02-04)
+- Upgraded to [enketo-transformer 2.1.2](https://github.com/enketo/enketo-transformer/blob/master/CHANGELOG.md#212---2022-02-01)
+- Upgraded to [openrosa-xpath-evaluator 2.0.10](https://github.com/enketo/openrosa-xpath-evaluator/blob/master/CHANGELOG.md#2010---2022-02-01)
+- [#379](https://github.com/enketo/enketo-express/pull/379) Switch from Travis CI to GitHub Actions CI
+- [#375](https://github.com/enketo/enketo-express/pull/375) Add codecov reporting
+
 [3.0.4] - 2021-11-04
 ---------------------
 ##### Changed

diff --git a/Gruntfile.js b/Gruntfile.js
@@ -109,7 +109,10 @@ module.exports = grunt => {
             },
             build: {
                 command: 'node ./scripts/build.js'
-            }
+            },
+            nyc: {
+                command: 'nyc --reporter html --reporter text-summary --reporter json --reporter lcov --report-dir ./test-coverage/server --include "app/**/*.js" grunt mochaTest:all'
+            },
         },
         eslint: {
             check: {
@@ -166,22 +169,6 @@ module.exports = grunt => {
                 }
             },
         },
-        nyc: {
-            cover: {
-                options: {
-                    reporter: [
-                        'html',
-                        'text-summary',
-                        'json',
-                        'lcov',
-                    ],
-                    reportDir: './test-coverage/server',
-                    include: [ 'app/**/*.js' ],
-                },
-                cmd: false,
-                args: [ 'grunt', 'mochaTest:all' ]
-            }
-        },
         env: {
             develop: {
                 NODE_ENV: 'develop'
@@ -250,7 +237,7 @@ module.exports = grunt => {
     grunt.registerTask( 'locales', [ 'i18next' ] );
     grunt.registerTask( 'js', [ 'widgets', 'shell:build' ] );
     grunt.registerTask( 'css', [ 'system-sass-variables:create', 'sass' ] );
-    grunt.registerTask( 'test', [ 'env:test', 'js', 'css', 'nyc:cover', 'karma:headless', 'shell:buildReadmeBadge', 'eslint:check' ] );
+    grunt.registerTask( 'test', [ 'env:test', 'js', 'css', 'shell:nyc', 'karma:headless', 'shell:buildReadmeBadge', 'eslint:check' ] );
     grunt.registerTask( 'test-browser', [ 'env:test', 'css', 'karma:browsers' ] );
     grunt.registerTask( 'test-watch-client', [ 'env:test', 'karma:watch' ], );
     grunt.registerTask( 'test-watch-server', [ 'env:test', 'watch:mochaTest' ], );

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.com/enketo/enketo-express.svg?branch=master)](https://travis-ci.org/enketo/enketo-express) [![Dependency Status](https://david-dm.org/enketo/enketo-express.svg)](https://david-dm.org/enketo/enketo-express) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/609aaf6fa764454f901f1c8a427264ff)](https://www.codacy.com/app/martijnr/enketo-express?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=enketo/enketo-express&amp;utm_campaign=Badge_Grade)
+[![Build Status](https://travis-ci.com/enketo/enketo-express.svg?branch=master)](https://travis-ci.org/enketo/enketo-express)
 
 Enketo Express
 ==============

diff --git a/docs/app_controllers_api-controller.js.html b/docs/app_controllers_api-controller.js.html
diff --git a/docs/app_controllers_api-v1-controller.js.html b/docs/app_controllers_api-v1-controller.js.html
diff --git a/docs/app_controllers_api-v2-controller.js.html b/docs/app_controllers_api-v2-controller.js.html
diff --git a/docs/app_controllers_authentication-controller.js.html b/docs/app_controllers_authentication-controller.js.html
diff --git a/docs/app_controllers_error-handler.js.html b/docs/app_controllers_error-handler.js.html
diff --git a/docs/app_controllers_media-controller.js.html b/docs/app_controllers_media-controller.js.html
diff --git a/docs/app_controllers_offline-controller.js.html b/docs/app_controllers_offline-controller.js.html
diff --git a/docs/app_controllers_pages-controller.js.html b/docs/app_controllers_pages-controller.js.html
diff --git a/docs/app_controllers_submission-controller.js.html b/docs/app_controllers_submission-controller.js.html
diff --git a/docs/app_controllers_survey-controller.js.html b/docs/app_controllers_survey-controller.js.html
diff --git a/docs/app_controllers_transformation-controller.js.html b/docs/app_controllers_transformation-controller.js.html
diff --git a/docs/app_lib_communicator_communicator.js.html b/docs/app_lib_communicator_communicator.js.html
diff --git a/docs/app_lib_custom-error.js.html b/docs/app_lib_custom-error.js.html
diff --git a/docs/app_lib_pdf.js.html b/docs/app_lib_pdf.js.html
diff --git a/docs/app_lib_router-utils.js.html b/docs/app_lib_router-utils.js.html
diff --git a/docs/app_lib_url.js.html b/docs/app_lib_url.js.html
diff --git a/docs/app_lib_utils.js.html b/docs/app_lib_utils.js.html
diff --git a/docs/app_models_account-model.js.html b/docs/app_models_account-model.js.html
diff --git a/docs/app_models_cache-model.js.html b/docs/app_models_cache-model.js.html
diff --git a/docs/app_models_config-model.js.html b/docs/app_models_config-model.js.html
diff --git a/docs/app_models_instance-model.js.html b/docs/app_models_instance-model.js.html
diff --git a/docs/app_models_record-model.js.html b/docs/app_models_record-model.js.html
diff --git a/docs/app_models_submission-model.js.html b/docs/app_models_submission-model.js.html
diff --git a/docs/app_models_survey-model.js.html b/docs/app_models_survey-model.js.html
diff --git a/docs/app_models_user-model.js.html b/docs/app_models_user-model.js.html
diff --git a/docs/global.html b/docs/global.html
diff --git a/docs/index.html b/docs/index.html
diff --git a/docs/module-account-model.html b/docs/module-account-model.html
diff --git a/docs/module-api-controller.html b/docs/module-api-controller.html
diff --git a/docs/module-api-v1-controller.html b/docs/module-api-v1-controller.html
diff --git a/docs/module-api-v2-controller.html b/docs/module-api-v2-controller.html
diff --git a/docs/module-authentication-controller.html b/docs/module-authentication-controller.html
diff --git a/docs/module-cache-model.html b/docs/module-cache-model.html
diff --git a/docs/module-communicator.html b/docs/module-communicator.html
diff --git a/docs/module-config-model.html b/docs/module-config-model.html
diff --git a/docs/module-custom-error.html b/docs/module-custom-error.html
diff --git a/docs/module-duplicates.html b/docs/module-duplicates.html
diff --git a/docs/module-error-handler.html b/docs/module-error-handler.html
diff --git a/docs/module-instance-model.html b/docs/module-instance-model.html
diff --git a/docs/module-media-controller.html b/docs/module-media-controller.html
diff --git a/docs/module-offline-resources-controller.html b/docs/module-offline-resources-controller.html
diff --git a/docs/module-pages-controller.html b/docs/module-pages-controller.html
diff --git a/docs/module-pdf.html b/docs/module-pdf.html
diff --git a/docs/module-router-utils.html b/docs/module-router-utils.html
diff --git a/docs/module-submission-model.html b/docs/module-submission-model.html
diff --git a/docs/module-submissions-controller.html b/docs/module-submissions-controller.html
diff --git a/docs/module-survey-controller.html b/docs/module-survey-controller.html
diff --git a/docs/module-survey-model.html b/docs/module-survey-model.html
diff --git a/docs/module-transformation-controller.html b/docs/module-transformation-controller.html
diff --git a/docs/module-user-model.html b/docs/module-user-model.html
diff --git a/docs/module-utils.html b/docs/module-utils.html
diff --git a/docs/tools_duplicates.js.html b/docs/tools_duplicates.js.html
diff --git a/docs/tools_esbuild-plugin-istanbul.js.html b/docs/tools_esbuild-plugin-istanbul.js.html
diff --git a/docs/tutorial-00-getting-started.html b/docs/tutorial-00-getting-started.html
diff --git a/docs/tutorial-02-heroku.html b/docs/tutorial-02-heroku.html
diff --git a/docs/tutorial-10-configure.html b/docs/tutorial-10-configure.html
diff --git a/docs/tutorial-12-ordinals.html b/docs/tutorial-12-ordinals.html
diff --git a/docs/tutorial-20-update.html b/docs/tutorial-20-update.html
diff --git a/docs/tutorial-30-develop.html b/docs/tutorial-30-develop.html
diff --git a/docs/tutorial-32-api.html b/docs/tutorial-32-api.html
diff --git a/docs/tutorial-34-custom-widgets.html b/docs/tutorial-34-custom-widgets.html
diff --git a/docs/tutorial-36-theming.html b/docs/tutorial-36-theming.html
diff --git a/docs/tutorial-38-iframe-postmessage.html b/docs/tutorial-38-iframe-postmessage.html
diff --git a/docs/tutorial-40-translate.html b/docs/tutorial-40-translate.html
diff --git a/docs/tutorial-60-authentication-and-security.html b/docs/tutorial-60-authentication-and-security.html
diff --git a/docs/tutorial-70-browser-support.html b/docs/tutorial-70-browser-support.html
diff --git a/docs/tutorial-80-comments.html b/docs/tutorial-80-comments.html
diff --git a/docs/tutorial-90-duplicates.html b/docs/tutorial-90-duplicates.html
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
     "name": "enketo-express",
     "description": "Webforms evolved.",
     "homepage": "https://enketo.org",
-    "version": "3.0.4",
+    "version": "3.0.5",
     "main": "./app.js",
     "engines": {
         "node": ">=14 <17",
@@ -39,39 +39,39 @@
     "dependencies": {
         "aliasify": "^2.1.0",
         "basic-auth": "^2.0.1",
-        "body-parser": "^1.19.0",
+        "body-parser": "^1.19.1",
         "bristol": "^0.4.0",
         "busboy": "^0.3.1",
         "compression": "^1.7.4",
-        "cookie-parser": "^1.4.5",
+        "cookie-parser": "^1.4.6",
         "csurf": "^1.11.0",
         "db.js": "^0.15.0",
-        "debug": "^4.3.2",
-        "enketo-core": "6.0.2",
-        "enketo-transformer": "2.1.1",
+        "debug": "^4.3.3",
+        "enketo-core": "^6.0.4",
+        "enketo-transformer": "2.1.2",
         "evp_bytestokey": "^1.0.3",
-        "express": "^4.17.1",
+        "express": "^4.17.2",
         "grunt": "^1.4.1",
         "grunt-env": "^1.0.1",
         "grunt-i18next": "^0.2.0",
         "grunt-shell-spawn": "^0.4.0",
         "i18next": "^20.6.1",
-        "i18next-browser-languagedetector": "^6.1.2",
-        "i18next-fs-backend": "^1.1.1",
-        "i18next-http-backend": "^1.3.1",
-        "i18next-http-middleware": "^3.1.4",
+        "i18next-browser-languagedetector": "^6.1.3",
+        "i18next-fs-backend": "^1.1.4",
+        "i18next-http-backend": "^1.3.2",
+        "i18next-http-middleware": "^3.1.6",
         "jquery": "^3.6.0",
         "jstransformer-markdown-it": "^2.1.0",
         "jszip": "^3.7.1",
         "jwt-simple": "^0.5.6",
         "load-grunt-tasks": "^5.1.0",
         "lodash": "^4.17.21",
         "morgan": "^1.10.0",
-        "node-forge": "^0.10.0",
+        "node-forge": "^1.2.1",
         "papaparse": "^5.3.1",
         "pkg-dir": "^5.0.0",
         "pug": "^3.0.2",
-        "puppeteer": "^10.4.0",
+        "puppeteer": "^13.1.3",
         "redis": "^3.1.2",
         "request": "^2.88.2",
         "request-filtering-agent": "^1.0.7",
@@ -86,10 +86,10 @@
         "@baladins/grunt-nodemon": "^0.4.6",
         "@types/db.js": "^0.14.7",
         "@types/express": "^4.17.13",
-        "@types/sinon": "^10.0.6",
+        "@types/sinon": "^10.0.10",
         "abortcontroller-polyfill": "^1.7.3",
         "bootstrap-datepicker": "1.9.0",
-        "chai": "^4.3.4",
+        "chai": "^4.3.6",
         "chai-as-promised": "^7.1.1",
         "docdash": "^1.2.0",
         "esbuild": "^0.12.29",
@@ -102,28 +102,28 @@
         "grunt-karma": "^4.0.2",
         "grunt-mocha-test": "^0.13.3",
         "grunt-sass": "^3.1.0",
-        "grunt-simple-nyc": "^3.0.1",
         "istanbul": "^0.4.5",
         "istanbul-lib-instrument": "^5.1.0",
         "istanbul-reporter-shield-badge": "^1.2.1",
-        "jsdoc": "^3.6.7",
+        "jsdoc": "^3.6.10",
         "jsdoc-ts-utils": "^2.0.1",
-        "karma": "^6.3.7",
+        "karma": "^6.3.14",
         "karma-chrome-launcher": "^3.1.0",
-        "karma-coverage": "^2.0.3",
+        "karma-coverage": "^2.1.0",
         "karma-esbuild": "^2.2.0",
         "karma-firefox-launcher": "^2.1.2",
         "karma-mocha": "^2.0.1",
         "karma-opera-launcher": "^1.0.0",
         "karma-safari-launcher": "^1.0.0",
         "karma-sinon-chai": "^2.0.2",
-        "mocha": "^9.1.3",
-        "nock": "^13.1.4",
-        "node-sass": "^6.0.1",
+        "mocha": "^9.2.0",
+        "nock": "^13.2.4",
+        "node-sass": "^7.0.1",
+        "nyc": "^15.1.0",
         "rimraf": "^3.0.2",
         "sinon": "^11.1.2",
         "sinon-chai": "^3.7.0",
-        "supertest": "^6.1.6"
+        "supertest": "^6.2.2"
     },
     "browser": {
         "enketo/config": "./public/js/src/module/client-config",