Remove jquery from hound

ForkPoint · Jun 8, 2023 · 9f8b5c5 · 9f8b5c5
1 parent 93eddc9
commit 9f8b5c5
Show file tree

Hide file tree

Showing 10 changed files with 84 additions and 38 deletions.
diff --git a/.prettierignore b/.prettierignore
@@ -1,3 +1,2 @@
 ui/assets/js/JSXTransformer-0.12.2.js
-ui/assets/js/jquery-2.1.3.min.js
 ui/assets/js/react-0.12.2.min.js
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -31,5 +31,9 @@
     "webpack": "^5.74.0",
     "webpack-cli": "^4.10.0",
     "webpack-dev-server": "^4.11.1"
+  },
+  "dependencies": {
+    "merge-anything": "^5.1.7",
+    "reqwest": "^2.0.5"
   }
-}
+}
diff --git a/ui/assets/excluded_files.tpl.html b/ui/assets/excluded_files.tpl.html
@@ -10,7 +10,6 @@
         <div id="root"></div>
 
         <script src="js/react-{{.ReactVersion}}.min.js"></script>
-        <script src="js/jquery-{{.jQueryVersion}}.min.js"></script>
         {{ .Source }}
     </body>
 </html>
diff --git a/ui/assets/index.tpl.html b/ui/assets/index.tpl.html
@@ -20,7 +20,6 @@
         var ModelData = {{ .ReposAsJson }};
         </script>
         <script src="js/react-{{.ReactVersion}}.min.js"></script>
-        <script src="js/jquery-{{.jQueryVersion}}.min.js"></script>
         {{ .Source }}
     </body>
 </html>
diff --git a/ui/assets/js/excluded_files.js b/ui/assets/js/excluded_files.js
@@ -1,4 +1,5 @@
 import {UrlToRepo} from './common';
+import reqwest from 'reqwest';
 
 var ExcludedRow = React.createClass({
   render: function() {
@@ -77,9 +78,9 @@ var RepoList = React.createClass({
 var FilterableExcludedFiles = React.createClass({
   getInitialState: function() {
     var _this = this;
-    $.ajax({
+    reqwest({
       url: 'api/v1/repos',
-      dataType: 'json',
+      type: 'json',
       success: function(data) {
         _this.setState({ repos: data });
       },
@@ -102,11 +103,10 @@ var FilterableExcludedFiles = React.createClass({
       searching: true,
       repo: this.state.repos[repo],
     });
-    $.ajax({
+    reqwest({
       url: 'api/v1/excludes',
       data: {repo: repo},
-      type: 'GET',
-      dataType: 'json',
+      type: 'json',
       success: function(data) {
         _this.setState({ files: data, searching: false });
       },

diff --git a/ui/assets/js/hound.js b/ui/assets/js/hound.js
@@ -1,5 +1,7 @@
 import { EscapeRegExp, UrlParts, UrlToRepo } from "./common";
 import { Signal } from "./signal";
+import reqwest from 'reqwest';
+import { merge } from 'merge-anything';
 
 var css = function (el, n, v) {
     el.style.setProperty(n, v, "");
@@ -112,9 +114,9 @@ var Model = {
             return;
         }
 
-        $.ajax({
+        reqwest({
             url: "api/v1/repos",
-            dataType: "json",
+            type: "json",
             success: function (data) {
                 _this.repos = data;
                 next();
@@ -131,7 +133,7 @@ var Model = {
         var _this = this,
             startedAt = Date.now();
 
-        params = $.extend(
+        params = merge(
             {
                 stats: "fosho",
                 repos: "*",
@@ -157,11 +159,10 @@ var Model = {
             return;
         }
 
-        $.ajax({
+        reqwest({
             url: "api/v1/search",
             data: params,
-            type: "GET",
-            dataType: "json",
+            type: "json",
             success: function (data) {
                 if (data.Error) {
                     _this.didError.raise(_this, data.Error);
@@ -223,16 +224,15 @@ var Model = {
 
         _this.willLoadMore.raise(this, repo, numLoaded, numNeeded, numToLoad);
 
-        var params = $.extend(this.params, {
+        var params = merge(this.params, {
             rng: numLoaded + ":" + endAt,
             repos: repo,
         });
 
-        $.ajax({
+        reqwest({
             url: "api/v1/search",
             data: params,
-            type: "GET",
-            dataType: "json",
+            type: "json",
             success: function (data) {
                 if (data.Error) {
                     _this.didError.raise(_this, data.Error);

diff --git a/ui/assets/js/jquery-2.1.3.min.js b/ui/assets/js/jquery-2.1.3.min.js
diff --git a/ui/content.go b/ui/content.go
@@ -4,8 +4,7 @@ import "io"
 
 // Current versions of some dependencies.
 const (
-	ReactVersion  = "0.12.2"
-	JQueryVersion = "2.1.3"
+	ReactVersion = "0.12.2"
 )
 
 var contents map[string]*content
@@ -22,7 +21,7 @@ type renderer interface {
 type content struct {
 
 	// The uri for accessing this asset
-	uri string  //nolint
+	uri string //nolint
 
 	// The filename of the template relative to the asset directory
 	template string

diff --git a/ui/ui.go b/ui/ui.go
@@ -95,12 +95,11 @@ func renderForDev(w io.Writer, root string, c *content, cfg *config.Config, r *h
 	}
 
 	return c.tpl.Execute(w, map[string]interface{}{
-		"ReactVersion":  ReactVersion,
-		"jQueryVersion": JQueryVersion,
-		"ReposAsJson":   json,
-		"Title":         cfg.Title,
-		"Source":        html_template.HTML(buf.String()),
-		"Host":          r.Host,
+		"ReactVersion": ReactVersion,
+		"ReposAsJson":  json,
+		"Title":        cfg.Title,
+		"Source":       html_template.HTML(buf.String()),
+		"Host":         r.Host,
 	})
 }
 
@@ -156,12 +155,11 @@ func renderForPrd(w io.Writer, c *content, cfg *config.Config, cfgJson string, r
 	buf.WriteString("</script>")
 
 	return c.tpl.Execute(w, map[string]interface{}{
-		"ReactVersion":  ReactVersion,
-		"jQueryVersion": JQueryVersion,
-		"ReposAsJson":   cfgJson,
-		"Title":         cfg.Title,
-		"Source":        html_template.HTML(buf.String()),
-		"Host":          r.Host,
+		"ReactVersion": ReactVersion,
+		"ReposAsJson":  cfgJson,
+		"Title":        cfg.Title,
+		"Source":       html_template.HTML(buf.String()),
+		"Host":         r.Host,
 	})
 }