From 49bf88f1605bb944ab58c8db5babaabd59a48910 Mon Sep 17 00:00:00 2001 From: Julia Afeltra <30803904+jafeltra@users.noreply.github.com> Date: Fri, 12 Jan 2024 10:47:52 -0500 Subject: [PATCH] SUSHI and GoFSH version updates, minor version updates (#149) * Minor updates to packages * Update to SUSHI 3.6.0 and GoFSH 2.2.0 - Update to latest SUSHI and GoFSH - Add antlr4 override to use latest release to fix issue with package entry points. Once SUSHI and GoFSH use the latest, the override can be removed. - Remove jest resolver, as it is no longer needed with the latest antlr4 release. --- package-lock.json | 148 ++++++++++++++++++--------------------- package.json | 14 ++-- resolver.js | 19 ----- src/components/TopBar.js | 2 +- 4 files changed, 77 insertions(+), 106 deletions(-) delete mode 100644 resolver.js diff --git a/package-lock.json b/package-lock.json index 4010b25..5796e9a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -17,14 +17,14 @@ "@testing-library/user-event": "^7.1.2", "bitly": "^7.1.2", "browserify-zlib": "^0.2.0", - "codemirror": "^5.62.3", + "codemirror": "^5.65.16", "file-saver": "^2.0.5", - "fsh-sushi": "^3.4.0", - "gofsh": "^2.1.2", + "fsh-sushi": "^3.6.0", + "gofsh": "^2.2.0", "jszip": "^3.10.1", "lodash": "^4.17.21", "react": "^16.13.1", - "react-codemirror2": "^7.2.1", + "react-codemirror2": "^7.3.0", "react-copy-to-clipboard": "^5.0.2", "react-dom": "^16.13.1", "react-router-dom": "^5.2.0", @@ -36,7 +36,7 @@ "eslint-plugin-prettier": "^3.1.3", "express": "^4.18.2", "fake-indexeddb": "^3.1.1", - "nock": "^13.2.2", + "nock": "^13.4.0", "null-loader": "^4.0.1", "prettier": "^2.0.5", "react-app-rewired": "^2.1.6", @@ -4225,9 +4225,12 @@ } }, "node_modules/antlr4": { - "version": "4.8.0", - "resolved": "https://registry.npmjs.org/antlr4/-/antlr4-4.8.0.tgz", - "integrity": "sha512-en/MxQ4OkPgGJQ3wD/muzj1uDnFSzdFIhc2+c6bHZokWkuBb6RRvFjpWhPxWLbgQvaEzldJZ0GSQpfSAaE3hqg==" + "version": "4.13.1-patch-1", + "resolved": "https://registry.npmjs.org/antlr4/-/antlr4-4.13.1-patch-1.tgz", + "integrity": "sha512-OjFLWWLzDMV9rdFhpvroCWR4ooktNg9/nvVYSA5z28wuVpU36QUNuioR1XLnQtcjVlf8npjyz593PxnU/f/Cow==", + "engines": { + "node": ">=16" + } }, "node_modules/anymatch": { "version": "3.1.3", @@ -6027,9 +6030,9 @@ } }, "node_modules/codemirror": { - "version": "5.65.13", - "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.65.13.tgz", - "integrity": "sha512-SVWEzKXmbHmTQQWaz03Shrh4nybG0wXx2MEu3FO4ezbPW8IbnZEd5iGHGEffSUaitKYa3i+pHpBsSvw8sPHtzg==" + "version": "5.65.16", + "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.65.16.tgz", + "integrity": "sha512-br21LjYmSlVL0vFCPWPfhzUCT34FM/pAdK7rRIZwa0rrtrIdotvP4Oh4GUHsu2E3IrQMCfRkL/fN3ytMNxVQvg==" }, "node_modules/collect-v8-coverage": { "version": "1.0.1", @@ -10119,18 +10122,17 @@ } }, "node_modules/fsh-sushi": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/fsh-sushi/-/fsh-sushi-3.4.0.tgz", - "integrity": "sha512-F07kXHydr1FM2elL7RT9lY7xRkGH9LXD6Qzl19ZRS15gXuPid/0xkRF5qn4h4skQIkZQqdZtQxgW0dTwn6pXdg==", - "hasInstallScript": true, + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/fsh-sushi/-/fsh-sushi-3.6.0.tgz", + "integrity": "sha512-G6JLb3FTnVrUkFppXzhUGDJcD0s3pljlS5iq+0P1UIvOxI+pR9qKVTZXELh2vDf4tDwNUkIiK33AD+njHKihJg==", "dependencies": { "ajv": "^8.12.0", - "antlr4": "~4.13.0", + "antlr4": "~4.13.1", "axios": "^0.21.4", "chalk": "^3.0.0", "commander": "^8.2.0", "fhir": "^4.9.0", - "fhir-package-loader": "^0.6.0", + "fhir-package-loader": "^0.7.0", "fs-extra": "^8.1.0", "html-minifier-terser": "5.1.1", "https-proxy-agent": "^5.0.0", @@ -10141,6 +10143,7 @@ "sanitize-filename": "^1.6.3", "sax": "^1.2.4", "temp": "^0.9.1", + "text-table": "^0.2.0", "title-case": "^3.0.2", "valid-url": "^1.0.9", "winston": "^3.3.3", @@ -10165,14 +10168,6 @@ "url": "https://github.com/sponsors/epoberezkin" } }, - "node_modules/fsh-sushi/node_modules/antlr4": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/antlr4/-/antlr4-4.13.0.tgz", - "integrity": "sha512-zooUbt+UscjnWyOrsuY/tVFL4rwrAGwOivpQmvmUDE22hy/lUA467Rc1rcixyRwcRUIXFYBwv7+dClDSHdmmew==", - "engines": { - "node": ">=16" - } - }, "node_modules/fsh-sushi/node_modules/chalk": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", @@ -10190,12 +10185,15 @@ "node_modules/fsh-sushi/node_modules/commander": { "version": "8.3.0", "resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz", - "integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==" + "integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==", + "engines": { + "node": ">= 12" + } }, "node_modules/fsh-sushi/node_modules/fhir-package-loader": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/fhir-package-loader/-/fhir-package-loader-0.6.0.tgz", - "integrity": "sha512-rqO2Iiz7rCopNbPbEF59j4jOMScb5fCnf/gdgLFpsWvkGsnalbV/Q+T3E4bRPjdvwhuyZAoUJezwnvEfrQfnZg==", + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/fhir-package-loader/-/fhir-package-loader-0.7.0.tgz", + "integrity": "sha512-Zd9A1yohoCNTMEp/vO4YiBmqvkdQgR7fxx0/7jqa6/Rd8JkYPjyXby137SHNdluRs+Wv1tUdztKfzYNWZv9bYg==", "dependencies": { "axios": "^0.21.1", "chalk": "^4.1.2", @@ -10252,9 +10250,9 @@ } }, "node_modules/fsh-sushi/node_modules/fhir-package-loader/node_modules/universalify": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", - "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", + "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", "engines": { "node": ">= 10.0.0" } @@ -10579,9 +10577,9 @@ } }, "node_modules/gofsh": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/gofsh/-/gofsh-2.1.2.tgz", - "integrity": "sha512-j/oO3ZYTNt/vMaZzrVGYES8C4uKcOZLPRK5O6thPijhyhjPf0VfvIzZdQjuHcjOEG4TPweTj7Eog/ccxjWz+SQ==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/gofsh/-/gofsh-2.2.0.tgz", + "integrity": "sha512-yC+M2Bc3aoyePc0XOvLPRknB37D/wGU2VKuyLQSv8xfFZkl3yXlgUkwvTUULYBbYXCxNNZZQodK+YtyxeE3rRg==", "dependencies": { "antlr4": "~4.8.0", "chalk": "^4.1.0", @@ -10592,7 +10590,7 @@ "fhir-package-loader": "^0.5.0", "flat": "^5.0.2", "fs-extra": "^9.0.1", - "fsh-sushi": "^3.4.0", + "fsh-sushi": "^3.5.0", "ini": "^1.3.8", "lodash": "^4.17.21", "readline-sync": "^1.4.10", @@ -14607,14 +14605,13 @@ } }, "node_modules/nock": { - "version": "13.3.1", - "resolved": "https://registry.npmjs.org/nock/-/nock-13.3.1.tgz", - "integrity": "sha512-vHnopocZuI93p2ccivFyGuUfzjq2fxNyNurp7816mlT5V5HF4SzXu8lvLrVzBbNqzs+ODooZ6OksuSUNM7Njkw==", + "version": "13.4.0", + "resolved": "https://registry.npmjs.org/nock/-/nock-13.4.0.tgz", + "integrity": "sha512-W8NVHjO/LCTNA64yxAPHV/K47LpGYcVzgKd3Q0n6owhwvD0Dgoterc25R4rnZbckJEb6Loxz1f5QMuJpJnbSyQ==", "dev": true, "dependencies": { "debug": "^4.1.0", "json-stringify-safe": "^5.0.1", - "lodash": "^4.17.21", "propagate": "^2.0.0" }, "engines": { @@ -17488,12 +17485,12 @@ } }, "node_modules/react-codemirror2": { - "version": "7.2.1", - "resolved": "https://registry.npmjs.org/react-codemirror2/-/react-codemirror2-7.2.1.tgz", - "integrity": "sha512-t7YFmz1AXdlImgHXA9Ja0T6AWuopilub24jRaQdPVbzUJVNKIYuy3uCFZYa7CE5S3UW6SrSa5nAqVQvtzRF9gw==", + "version": "7.3.0", + "resolved": "https://registry.npmjs.org/react-codemirror2/-/react-codemirror2-7.3.0.tgz", + "integrity": "sha512-gCgJPXDX+5iaPolkHAu1YbJ92a2yL7Je4TuyO3QEqOtI/d6mbEk08l0oIm18R4ctuT/Sl87X63xIMBnRQBXYXA==", "peerDependencies": { "codemirror": "5.x", - "react": ">=15.5 <=16.x" + "react": ">=15.5 <=17.x" } }, "node_modules/react-copy-to-clipboard": { @@ -27166,9 +27163,9 @@ } }, "antlr4": { - "version": "4.8.0", - "resolved": "https://registry.npmjs.org/antlr4/-/antlr4-4.8.0.tgz", - "integrity": "sha512-en/MxQ4OkPgGJQ3wD/muzj1uDnFSzdFIhc2+c6bHZokWkuBb6RRvFjpWhPxWLbgQvaEzldJZ0GSQpfSAaE3hqg==" + "version": "4.13.1-patch-1", + "resolved": "https://registry.npmjs.org/antlr4/-/antlr4-4.13.1-patch-1.tgz", + "integrity": "sha512-OjFLWWLzDMV9rdFhpvroCWR4ooktNg9/nvVYSA5z28wuVpU36QUNuioR1XLnQtcjVlf8npjyz593PxnU/f/Cow==" }, "anymatch": { "version": "3.1.3", @@ -28586,9 +28583,9 @@ } }, "codemirror": { - "version": "5.65.13", - "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.65.13.tgz", - "integrity": "sha512-SVWEzKXmbHmTQQWaz03Shrh4nybG0wXx2MEu3FO4ezbPW8IbnZEd5iGHGEffSUaitKYa3i+pHpBsSvw8sPHtzg==" + "version": "5.65.16", + "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.65.16.tgz", + "integrity": "sha512-br21LjYmSlVL0vFCPWPfhzUCT34FM/pAdK7rRIZwa0rrtrIdotvP4Oh4GUHsu2E3IrQMCfRkL/fN3ytMNxVQvg==" }, "collect-v8-coverage": { "version": "1.0.1", @@ -31806,17 +31803,17 @@ "optional": true }, "fsh-sushi": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/fsh-sushi/-/fsh-sushi-3.4.0.tgz", - "integrity": "sha512-F07kXHydr1FM2elL7RT9lY7xRkGH9LXD6Qzl19ZRS15gXuPid/0xkRF5qn4h4skQIkZQqdZtQxgW0dTwn6pXdg==", + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/fsh-sushi/-/fsh-sushi-3.6.0.tgz", + "integrity": "sha512-G6JLb3FTnVrUkFppXzhUGDJcD0s3pljlS5iq+0P1UIvOxI+pR9qKVTZXELh2vDf4tDwNUkIiK33AD+njHKihJg==", "requires": { "ajv": "^8.12.0", - "antlr4": "~4.13.0", + "antlr4": "4.13.1-patch-1", "axios": "^0.21.4", "chalk": "^3.0.0", "commander": "^8.2.0", "fhir": "^4.9.0", - "fhir-package-loader": "^0.6.0", + "fhir-package-loader": "^0.7.0", "fs-extra": "^8.1.0", "html-minifier-terser": "5.1.1", "https-proxy-agent": "^5.0.0", @@ -31827,6 +31824,7 @@ "sanitize-filename": "^1.6.3", "sax": "^1.2.4", "temp": "^0.9.1", + "text-table": "^0.2.0", "title-case": "^3.0.2", "valid-url": "^1.0.9", "winston": "^3.3.3", @@ -31844,11 +31842,6 @@ "uri-js": "^4.2.2" } }, - "antlr4": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/antlr4/-/antlr4-4.13.0.tgz", - "integrity": "sha512-zooUbt+UscjnWyOrsuY/tVFL4rwrAGwOivpQmvmUDE22hy/lUA467Rc1rcixyRwcRUIXFYBwv7+dClDSHdmmew==" - }, "chalk": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", @@ -31869,9 +31862,9 @@ "integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==" }, "fhir-package-loader": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/fhir-package-loader/-/fhir-package-loader-0.6.0.tgz", - "integrity": "sha512-rqO2Iiz7rCopNbPbEF59j4jOMScb5fCnf/gdgLFpsWvkGsnalbV/Q+T3E4bRPjdvwhuyZAoUJezwnvEfrQfnZg==", + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/fhir-package-loader/-/fhir-package-loader-0.7.0.tgz", + "integrity": "sha512-Zd9A1yohoCNTMEp/vO4YiBmqvkdQgR7fxx0/7jqa6/Rd8JkYPjyXby137SHNdluRs+Wv1tUdztKfzYNWZv9bYg==", "requires": { "axios": "^0.21.1", "chalk": "^4.1.2", @@ -31914,9 +31907,9 @@ } }, "universalify": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", - "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==" + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", + "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==" } } }, @@ -32166,11 +32159,11 @@ } }, "gofsh": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/gofsh/-/gofsh-2.1.2.tgz", - "integrity": "sha512-j/oO3ZYTNt/vMaZzrVGYES8C4uKcOZLPRK5O6thPijhyhjPf0VfvIzZdQjuHcjOEG4TPweTj7Eog/ccxjWz+SQ==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/gofsh/-/gofsh-2.2.0.tgz", + "integrity": "sha512-yC+M2Bc3aoyePc0XOvLPRknB37D/wGU2VKuyLQSv8xfFZkl3yXlgUkwvTUULYBbYXCxNNZZQodK+YtyxeE3rRg==", "requires": { - "antlr4": "~4.8.0", + "antlr4": "4.13.1-patch-1", "chalk": "^4.1.0", "commander": "^6.0.0", "diff": "^5.0.0", @@ -32179,7 +32172,7 @@ "fhir-package-loader": "^0.5.0", "flat": "^5.0.2", "fs-extra": "^9.0.1", - "fsh-sushi": "^3.4.0", + "fsh-sushi": "^3.5.0", "ini": "^1.3.8", "lodash": "^4.17.21", "readline-sync": "^1.4.10", @@ -35364,14 +35357,13 @@ } }, "nock": { - "version": "13.3.1", - "resolved": "https://registry.npmjs.org/nock/-/nock-13.3.1.tgz", - "integrity": "sha512-vHnopocZuI93p2ccivFyGuUfzjq2fxNyNurp7816mlT5V5HF4SzXu8lvLrVzBbNqzs+ODooZ6OksuSUNM7Njkw==", + "version": "13.4.0", + "resolved": "https://registry.npmjs.org/nock/-/nock-13.4.0.tgz", + "integrity": "sha512-W8NVHjO/LCTNA64yxAPHV/K47LpGYcVzgKd3Q0n6owhwvD0Dgoterc25R4rnZbckJEb6Loxz1f5QMuJpJnbSyQ==", "dev": true, "requires": { "debug": "^4.1.0", "json-stringify-safe": "^5.0.1", - "lodash": "^4.17.21", "propagate": "^2.0.0" } }, @@ -37682,9 +37674,9 @@ } }, "react-codemirror2": { - "version": "7.2.1", - "resolved": "https://registry.npmjs.org/react-codemirror2/-/react-codemirror2-7.2.1.tgz", - "integrity": "sha512-t7YFmz1AXdlImgHXA9Ja0T6AWuopilub24jRaQdPVbzUJVNKIYuy3uCFZYa7CE5S3UW6SrSa5nAqVQvtzRF9gw==", + "version": "7.3.0", + "resolved": "https://registry.npmjs.org/react-codemirror2/-/react-codemirror2-7.3.0.tgz", + "integrity": "sha512-gCgJPXDX+5iaPolkHAu1YbJ92a2yL7Je4TuyO3QEqOtI/d6mbEk08l0oIm18R4ctuT/Sl87X63xIMBnRQBXYXA==", "requires": {} }, "react-copy-to-clipboard": { diff --git a/package.json b/package.json index c13b697..acbf241 100644 --- a/package.json +++ b/package.json @@ -13,14 +13,14 @@ "@testing-library/user-event": "^7.1.2", "bitly": "^7.1.2", "browserify-zlib": "^0.2.0", - "codemirror": "^5.62.3", + "codemirror": "^5.65.16", "file-saver": "^2.0.5", - "fsh-sushi": "^3.4.0", - "gofsh": "^2.1.2", + "fsh-sushi": "^3.6.0", + "gofsh": "^2.2.0", "jszip": "^3.10.1", "lodash": "^4.17.21", "react": "^16.13.1", - "react-codemirror2": "^7.2.1", + "react-codemirror2": "^7.3.0", "react-copy-to-clipboard": "^5.0.2", "react-dom": "^16.13.1", "react-router-dom": "^5.2.0", @@ -32,7 +32,7 @@ "eslint-plugin-prettier": "^3.1.3", "express": "^4.18.2", "fake-indexeddb": "^3.1.1", - "nock": "^13.2.2", + "nock": "^13.4.0", "null-loader": "^4.0.1", "prettier": "^2.0.5", "react-app-rewired": "^2.1.6", @@ -40,6 +40,7 @@ "serve-static": "^1.15.0" }, "overrides": { + "antlr4": "4.13.1-patch-1", "react-dev-utils": { "react-error-overlay": "6.0.9" } @@ -57,9 +58,6 @@ "eslintConfig": { "extends": "react-app" }, - "jest": { - "resolver": "/resolver.js" - }, "browserslist": [ "defaults" ] diff --git a/resolver.js b/resolver.js deleted file mode 100644 index b8e6d7e..0000000 --- a/resolver.js +++ /dev/null @@ -1,19 +0,0 @@ -// Based on documentation here: https://jestjs.io/docs/configuration#resolver-string -// FSH Online needs a resolver because the anltr4 package tries to manipulate which dist file -// to use in node vs browser environments in the package.json#exports property. -// However, Jest ignores the exports property. So we need a resolver to resolve it correctly. -// Also see https://github.com/jestjs/jest/issues/10422 -module.exports = (path, options) => { - // Call the defaultResolver, so we leverage its cache, error handling, etc. - return options.defaultResolver(path, { - ...options, - // Use packageFilter to process parsed `package.json` before the resolution (see https://www.npmjs.com/package/resolve#resolveid-opts-cb) - packageFilter: (pkg) => { - return { - ...pkg, - // Alter the value of `main` before resolving the antlr4 package - main: pkg.name === 'antlr4' ? 'dist/antlr4.node.cjs' : pkg.main - }; - } - }); -}; diff --git a/src/components/TopBar.js b/src/components/TopBar.js index e70adaf..30d5c1b 100644 --- a/src/components/TopBar.js +++ b/src/components/TopBar.js @@ -59,7 +59,7 @@ export default function TopBar() { FSH ONLINE - Powered by SUSHI v3.4.0 and GoFSH v2.1.2 + Powered by SUSHI v3.6.0 and GoFSH v2.2.0