From 78cc9dbcebedaa7e00f09e58c5d20463396829e1 Mon Sep 17 00:00:00 2001 From: Yaw Anokwa Date: Thu, 4 Nov 2021 11:34:38 -0700 Subject: [PATCH] Prepare for 2.1.1 (#133) --- CHANGELOG.md | 5 +++++ README.md | 2 +- docs/global.html | 2 +- docs/index.html | 4 +++- docs/url.js.html | 13 +++++-------- package-lock.json | 44 +++++++++++++++++++------------------------- package.json | 2 +- 7 files changed, 35 insertions(+), 37 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 97fc8b7..61a7d72 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,11 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). +[2.1.1] - 2021-11-04 +------------------------ +##### Fixed +- Preserve query parameters in media mapping URLs + [2.1.0] - 2021-10-11 ------------------------ ##### Added diff --git a/README.md b/README.md index 91598ae..d2a0f02 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -![coverage-shield-badge-1](https://img.shields.io/badge/coverage-97.86%25-brightgreen.svg) +![coverage-shield-badge-1](https://img.shields.io/badge/coverage-97.85%25-brightgreen.svg) [![npm version](https://badge.fury.io/js/enketo-transformer.svg)](http://badge.fury.io/js/enketo-transformer) [![Build Status](https://travis-ci.org/enketo/enketo-transformer.svg?branch=master)](https://travis-ci.org/enketo/enketo-transformer) [![Dependency Status](https://david-dm.org/enketo/enketo-transformer.svg)](https://david-dm.org/enketo/enketo-transformer) Enketo Transformer diff --git a/docs/global.html b/docs/global.html index c953755..1868889 100644 --- a/docs/global.html +++ b/docs/global.html @@ -291,7 +291,7 @@

getMediaP
Source:
diff --git a/docs/index.html b/docs/index.html index 59c162f..01b5a87 100644 --- a/docs/index.html +++ b/docs/index.html @@ -62,7 +62,7 @@

-

coverage-shield-badge-1 +

coverage-shield-badge-1 npm version Build Status Dependency Status

Enketo Transformer

NodeJS library that transforms OpenRosa/ODK XForms into a format the Enketo understands. It works both as a library module, as well as a standalone app.

@@ -166,6 +166,8 @@

Release

  • Run npm audit fix --production to apply most important fixes
    • +
  • Run npm ci
    • +
  • Run npm test
  • Run npm run build-docs
  • Update CHANGELOG.md
  • Update version in package.json diff --git a/docs/url.js.html b/docs/url.js.html index fce49ba..e3b288b 100644 --- a/docs/url.js.html +++ b/docs/url.js.html @@ -51,7 +51,7 @@

    url.js

    * @param {string} value - a fully qualified URL, or a relative path * @return {string} */ - function escapeURLPath( value ) { +function escapeURLPath( value ) { const isFullyQualified = ( /^[a-z]+:/i ).test( value ); const urlString = isFullyQualified ? value : `file:///${value.replace( /^\//, '' )}`; const url = new URL( urlString ); @@ -60,20 +60,17 @@

    url.js

    return url.href; } - const { pathname } = url; + const { pathname, search } = url; + const path = value.startsWith( '/' ) ? pathname : pathname.replace( /^\//, '' ); - if ( value.startsWith( '/' ) ) { - return pathname; - } - - return pathname.replace( /^\//, '' ); + return `${path}${search}`; } /** * @param {Record<string, string>} mediaMap * @param {string} mediaURL */ - function getMediaPath( mediaMap, mediaURL ) { +function getMediaPath( mediaMap, mediaURL ) { const mediaPath = mediaURL.match( /jr:\/\/[\w-]+\/(.+)/ ); if ( mediaPath == null ) { diff --git a/package-lock.json b/package-lock.json index 9d03633..7e523d9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -613,8 +613,7 @@ "ansi-regex": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "dev": true + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==" }, "ansi-styles": { "version": "3.2.1", @@ -1555,8 +1554,7 @@ "emoji-regex": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" }, "encodeurl": { "version": "1.0.2", @@ -3162,9 +3160,9 @@ "dev": true }, "is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=" + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==" }, "is-glob": { "version": "4.0.1", @@ -5630,25 +5628,21 @@ "integrity": "sha1-PYRT5ydKLkShQrPchEnftk2a3jo=" }, "string-width": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", "requires": { - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^4.0.0" + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" }, "dependencies": { - "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=" - }, "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", "requires": { - "ansi-regex": "^3.0.0" + "ansi-regex": "^5.0.1" } } } @@ -6179,11 +6173,11 @@ "dev": true }, "wide-align": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz", - "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==", + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz", + "integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==", "requires": { - "string-width": "^1.0.2 || 2" + "string-width": "^1.0.2 || 2 || 3 || 4" } }, "widest-line": { diff --git a/package.json b/package.json index 8297647..5e4d9be 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "enketo-transformer", - "version": "2.1.0", + "version": "2.1.1", "description": "Library/app that transforms ODK-compliant XForms into a format that Enketo can consume", "license": "Apache-2.0", "main": "src/transformer.js",