Import Lodash in Peggy code, drop window._

spraakbanken · Mar 5, 2024 · 6c05267 · 6c05267
1 parent c6d30eb
commit 6c05267
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 11 deletions.
diff --git a/app/index.js b/app/index.js
@@ -26,9 +26,6 @@ require("./styles/tailwind.scss")
 require("./styles/styles.scss")
 require("./styles/textreader.css")
 
-// TODO Remove from window. Still used in CQPParser.pegjs.
-window._ = require("lodash")
-
 require("components-jqueryui/ui/widget.js")
 require("components-jqueryui/ui/widgets/sortable.js")
 require("components-jqueryui/ui/widgets/dialog.js")
@@ -90,8 +87,6 @@ require("angular-filter/index.js")
 
 require("./lib/jquery.tooltip.pack.js")
 
-
-
 require("./scripts/components/sidebar.js")
 
 require("./scripts/statistics.js")

diff --git a/app/scripts/cqp_parser/CQPParser.js b/app/scripts/cqp_parser/CQPParser.js
@@ -2,6 +2,8 @@
 //
 // https://peggyjs.org/
 
+import _ from "lodash";
+
 
 function peg$subclass(child, parent) {
   function C() { this.constructor = child; }
@@ -1910,10 +1912,8 @@ function peg$parse(input, options) {
     return output
   }
 
-  var _ = window._
   var c = console
 
-
   peg$result = peg$startRuleFunction();
 
   if (options.peg$library) {

diff --git a/app/scripts/cqp_parser/CQPParser.peggy b/app/scripts/cqp_parser/CQPParser.peggy
@@ -11,9 +11,7 @@
     return output
   }
 
-  var _ = window._
   var c = console
-
 }
 
 

diff --git a/app/scripts/cqp_parser/README b/app/scripts/cqp_parser/README
@@ -1,5 +1,5 @@
 Rebuild parser:
 
 ```sh
-npx peggy --format es CQPParser.pegjs
+npx peggy --format es -d _:lodash CQPParser.peggy
 ```
diff --git a/doc/frontend_devel.md b/doc/frontend_devel.md
@@ -794,7 +794,7 @@ To rebuild JS code from the Peggy file, do:
 
 ```sh
 cd app/scripts/cqp_parser
-npx peggy --format es CQPParser.pegjs
+npx peggy --format es -d _:lodash CQPParser.peggy
 ```
 
 ## Contributing with pull requests on Github
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,9 +11,7 @@ @@
         return output
       }
-      var _ = window._
       var c = console
     }
@@ Expand Down @@