From f2cdd8d225dd107f0d3f9dbbc690da2c3e374384 Mon Sep 17 00:00:00 2001 From: sedinkinya Date: Mon, 2 May 2022 18:36:09 -0400 Subject: [PATCH] Update NodeJS and antlr4 LF-2205 --- .gitignore | 2 +- CHANGELOG.md | 5 + Gruntfile.js | 10 +- bashrc.fhirpath | 2 +- browser-build/test/protractor/index.html | 3 +- browser-build/webpack.config.js | 2 +- package-lock.json | 17186 +++++++++++++++++++-- package.json | 6 +- src/parser/antlr4-index.js | 38 +- src/parser/generated/FHIRPathLexer.js | 131 +- src/parser/generated/FHIRPathListener.js | 507 +- src/parser/generated/FHIRPathParser.js | 3935 ++--- src/parser/index.js | 38 +- 13 files changed, 18456 insertions(+), 3409 deletions(-) diff --git a/.gitignore b/.gitignore index bc2cd3e..15c2365 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -antlr-4.7.1-complete.jar +antlr-4.9.3-complete.jar node_modules downloads src/scratch.js diff --git a/CHANGELOG.md b/CHANGELOG.md index aded836..c96beb9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,11 @@ This log documents significant changes for each release. This project follows [Semantic Versioning](http://semver.org/). +## [2.14.3] - 2022-05-02 +### Changed +- Updated to NodeJS 16. +- Updated the antlr4 dependency to 4.9.3. + ## [2.14.2] - 2022-04-12 ### Fixed - Corrected scope of function parameter of `collection` type for `union`, diff --git a/Gruntfile.js b/Gruntfile.js index 07b4808..e4cc782 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -12,8 +12,14 @@ module.exports = function (grunt) { src: ['src/parser/generated/*.js'], overwrite: true, replacements: [{ - from: /'antlr4\/index'/g, - to: "'../antlr4-index'" + from: "import antlr4 from 'antlr4';", + to: "const antlr4 = require('../antlr4-index');" + }, { + from: "import FHIRPathListener from './FHIRPathListener.js';", + to: "const FHIRPathListener = require('./FHIRPathListener');" + }, { + from: /export default class (.*) extends ([\s\S]*)/gm, + to: "class $1 extends $2\nmodule.exports = $1;" }] } } diff --git a/bashrc.fhirpath b/bashrc.fhirpath index e9ce303..3269a1c 100644 --- a/bashrc.fhirpath +++ b/bashrc.fhirpath @@ -1,7 +1,7 @@ # The following is the standard bashrc file for the # development team for this repository. -NODE=node-v12.18.3-linux-x64 +NODE=node-v16.15.0-linux-x64 # # Set path PATH=~/${NODE}/bin:/bin:/usr/local/bin:/usr/bin:/usr/sbin:/sbin:/etc diff --git a/browser-build/test/protractor/index.html b/browser-build/test/protractor/index.html index fb8fda8..c253681 100644 --- a/browser-build/test/protractor/index.html +++ b/browser-build/test/protractor/index.html @@ -1,7 +1,8 @@ - + + Test page for the browser build