Merge pull request #39 in LFOR/fhirpath.js from feature/LF-2205/updat…

…e-nodejs-and-antlr4 to master * commit 'f2cdd8d225dd107f0d3f9dbbc690da2c3e374384': Update NodeJS and antlr4
HL7 · May 11, 2022 · 30c2b77 · 30c2b77
2 parents a869956 + f2cdd8d
commit 30c2b77
Show file tree

Hide file tree

Showing 13 changed files with 18,456 additions and 3,409 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -1,7 +1,8 @@
 <!DOCTYPE html>
-<html>
+<html lang="en">
 <head>
  <meta charset="utf-8">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge">
  <title>Test page for the browser build</title>
  <style type="text/css">
  ul {

diff --git a/browser-build/webpack.config.js b/browser-build/webpack.config.js
@@ -18,7 +18,7 @@ function makeBaseConfig() {
  rules: [
  {
  test: /\.m?js$/,
- exclude: /(node_modules\/(?!@lhncbc)|bower_components)/,
+ exclude: /(node_modules\/(?!@lhncbc|antlr4)|bower_components)/,
  use: {
  loader: 'babel-loader',
  options: {