Update ANTLR4 and rollup (#54)

chaiNNer-org · Apr 8, 2024 · 215c47d · 215c47d
1 parent 9b461af
commit 215c47d
Show file tree

Hide file tree

Showing 8 changed files with 567 additions and 232 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -39,16 +39,16 @@
     "node": ">=16.0.0"
   },
   "devDependencies": {
-    "@rollup/plugin-node-resolve": "^15.0.1",
-    "@rollup/plugin-replace": "^5.0.2",
-    "@rollup/plugin-run": "^3.0.1",
-    "@rollup/plugin-typescript": "^11.0.0",
+    "@rollup/plugin-node-resolve": "^15.2.3",
+    "@rollup/plugin-replace": "^5.0.5",
+    "@rollup/plugin-run": "^3.0.2",
+    "@rollup/plugin-typescript": "^11.1.6",
     "@types/antlr4": "^4.7.3",
     "@types/jest": "^29.1.1",
     "@types/node": "^18.14.1",
     "@typescript-eslint/eslint-plugin": "^5.39.0",
     "@typescript-eslint/parser": "^5.39.0",
-    "antlr4": "^4.11.0",
+    "antlr4": "^4.13.1-patch-1",
     "eslint": "^8.24.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-import-resolver-typescript": "^3.5.1",
@@ -61,7 +61,7 @@
     "nodejs-file-downloader": "^4.10.2",
     "prettier": "^2.7.1",
     "rimraf": "^4.1.2",
-    "rollup": "^3.17.3",
+    "rollup": "^4.14.1",
     "ts-jest": "^29.0.3",
     "ts-node": "^10.9.1",
     "typescript": "^4.8.4"

diff --git a/rollup.config.mjs b/rollup.config.mjs
@@ -27,13 +27,17 @@ const config = {
                 "fs.readFileSync(__dirname + '/global.navi', 'utf-8')": JSON.stringify(globalNavi),
             },
             delimiters: ['', ''],
+            preventAssignment: true,
         }),
-        nodeResolve({ extensions: ['.mjs', '.js', '.json', '.ts'] }),
+        nodeResolve({ extensions: ['.mjs', '.js', '.json', '.ts'], browser: true }),
         typescript(),
         run({
             execArgv: ['-r', 'source-map-support/register'],
         }),
     ],
+    treeshake: {
+        preset: 'smallest',
+    },
 };
 
 // eslint-disable-next-line import/no-default-export

diff --git a/scripts/antlr4.ts b/scripts/antlr4.ts
@@ -7,7 +7,7 @@ import util from 'util';
 
 const exec = util.promisify(_exec);
 
-const version = '4.10.1';
+const version = '4.13.1';
 const jar = path.join(__dirname, '.antlr', `antlr-${version}-complete.jar`);
 
 const fileExists = (file: string): Promise<boolean> =>

diff --git a/src/antlr4/NaviLexer.js b/src/antlr4/NaviLexer.js
@@ -1,4 +1,4 @@
-// Generated from src/antlr4/Navi.g4 by ANTLR 4.10.1
+// Generated from src/antlr4/Navi.g4 by ANTLR 4.13.1
 // jshint ignore: start
 import antlr4 from 'antlr4';
 
@@ -172,11 +172,7 @@ export default class NaviLexer extends antlr4.Lexer {
 
     constructor(input) {
         super(input)
-        this._interp = new antlr4.atn.LexerATNSimulator(this, atn, decisionsToDFA, new antlr4.PredictionContextCache());
-    }
-
-    get atn() {
-        return atn;
+        this._interp = new antlr4.atn.LexerATNSimulator(this, atn, decisionsToDFA, new antlr4.atn.PredictionContextCache());
     }
 }
 

diff --git a/src/antlr4/NaviListener.js b/src/antlr4/NaviListener.js
@@ -1,4 +1,4 @@
-// Generated from src/antlr4/Navi.g4 by ANTLR 4.10.1
+// Generated from src/antlr4/Navi.g4 by ANTLR 4.13.1
 // jshint ignore: start
 import antlr4 from 'antlr4';