Merge pull request #880 from hgiesel/remdeps2

Add css-browser-selector and protobufjs as bazel deps

qt/aqt/clayout.py

@@ -309,7 +309,7 @@ class CardLayout(QDialog):
 
         jsinc = [
             "js/vendor/jquery.min.js",
-            "js/vendor/browsersel.js",
+            "js/vendor/css_browser_selector.min.js",
             "js/mathjax.js",
             "js/vendor/mathjax/tex-chtml.js",
             "js/reviewer.js",

qt/aqt/data/web/js/vendor/BUILD.bazel

@@ -1,5 +1,7 @@
 load("//ts:jquery.bzl", "copy_jquery")
 load("//ts:jquery-ui.bzl", "copy_jquery_ui")
+load("//ts:protobufjs.bzl", "copy_protobufjs")
+load("//ts:css-browser-selector.bzl", "copy_css_browser_selector")
 
 copy_jquery(
     name = "jquery",
@@ -11,10 +13,22 @@ copy_jquery_ui(
     visibility = ["//visibility:public"],
 )
 
+copy_protobufjs(
+    name = "protobufjs",
+    visibility = ["//visibility:public"],
+)
+
+copy_css_browser_selector(
+    name = "css-browser-selector",
+    visibility = ["//visibility:public"],
+)
+
 
 files = [
     "jquery",
     "jquery-ui",
+    "protobufjs",
+    "css-browser-selector",
 ]
 
 directories = [

qt/aqt/data/web/js/vendor/browsersel.js

@@ -1 +0,0 @@
-/* CSS Browser Selector v0.4.0 (Nov 02, 2010) Rafael Lima (http://rafael.adm.br). CC BY 2.5. */function css_browser_selector(u){var ua=u.toLowerCase(),is=function(t){return ua.indexOf(t)>-1},g='gecko',w='webkit',s='safari',o='opera',m='mobile',h=document.documentElement,b=[(!(/opera|webtv/i.test(ua))&&/msie\s(\d)/.test(ua))?('ie ie'+RegExp.$1):is('firefox/2')?g+' ff2':is('firefox/3.5')?g+' ff3 ff3_5':is('firefox/3.6')?g+' ff3 ff3_6':is('firefox/3')?g+' ff3':is('gecko/')?g:is('opera')?o+(/version\/(\d+)/.test(ua)?' '+o+RegExp.$1:(/opera(\s|\/)(\d+)/.test(ua)?' '+o+RegExp.$2:'')):is('konqueror')?'konqueror':is('blackberry')?m+' blackberry':is('android')?m+' android':is('chrome')?w+' chrome':is('iron')?w+' iron':is('applewebkit/')?w+' '+s+(/version\/(\d+)/.test(ua)?' '+s+RegExp.$1:''):is('mozilla/')?g:'',is('j2me')?m+' j2me':is('iphone')?m+' iphone':is('ipod')?m+' ipod':is('ipad')?m+' ipad':is('mac')?'mac':is('darwin')?'mac':is('webtv')?'webtv':is('win')?'win'+(is('windows nt 6.0')?' vista':''):is('freebsd')?'freebsd':(is('x11')||is('linux'))?'linux':'','js']; c = b.join(' '); h.className += ' '+c; return c;}; css_browser_selector(navigator.userAgent);

qt/aqt/mediasrv.py

@@ -201,6 +201,10 @@ def _redirectWebExports(path):
                 base = "jquery-ui.min"
                 addprefix = "js/vendor/"
 
+            elif base == "browsersel":
+                base = "css_browser_selector.min"
+                addprefix = "js/vendor/"
+
         if addprefix:
             oldpath = path
             path = f"{targetPath}{addprefix}{base}{ext}"

qt/aqt/previewer.py

@@ -111,7 +111,7 @@ class Previewer(QDialog):
     def _setup_web_view(self):
         jsinc = [
             "js/vendor/jquery.min.js",
-            "js/vendor/browsersel.js",
+            "js/vendor/css_browser_selector.min.js",
             "js/mathjax.js",
             "js/vendor/mathjax/tex-chtml.js",
             "js/reviewer.js",

qt/aqt/reviewer.py

@@ -159,7 +159,7 @@ class Reviewer:
             css=["css/reviewer.css"],
             js=[
                 "js/vendor/jquery.min.js",
-                "js/vendor/browsersel.js",
+                "js/vendor/css_browser_selector.min.js",
                 "js/mathjax.js",
                 "js/vendor/mathjax/tex-chtml.js",
                 "js/reviewer.js",

ts/css-browser-selector.bzl

@@ -0,0 +1,29 @@
+load("//ts:copy.bzl", "copy_files")
+
+"Rule to copy css-browser-selector subset from node_modules to vendor folder."
+
+_include = [
+    "css_browser_selector.min.js",
+]
+
+_unwanted_prefix = "external/npm/node_modules/css-browser-selector/"
+
+def _copy_css_browser_selector_impl(ctx):
+    wanted = []
+    for f in ctx.attr.css_browser_selector.files.to_list():
+        path = f.path
+        want = True
+
+        for substr in _include:
+            if substr in path:
+                output = path.replace(_unwanted_prefix, "")
+                wanted.append((f, output))
+
+    return copy_files(ctx, wanted)
+
+copy_css_browser_selector = rule(
+    implementation = _copy_css_browser_selector_impl,
+    attrs = {
+        "css_browser_selector": attr.label(default = "@npm//css-browser-selector:css-browser-selector__files"),
+    },
+)

ts/licenses.json

@@ -99,6 +99,13 @@
         "path": "node_modules/protobufjs/node_modules/@types/node",
         "licenseFile": "node_modules/protobufjs/node_modules/@types/node/LICENSE"
     },
+    "css-browser-selector@0.6.5": {
+        "licenses": "CC-BY-SA-2.5",
+        "repository": "https://github.com/verbatim/css_browser_selector",
+        "publisher": "Rafael Lima",
+        "path": "node_modules/css-browser-selector",
+        "licenseFile": "node_modules/css-browser-selector/README.mkdn"
+    },
     "d3-array@2.9.1": {
         "licenses": "BSD-3-Clause",
         "repository": "https://github.com/d3/d3-array",

ts/package.json

@@ -52,6 +52,7 @@
     },
     "dependencies": {
         "@fluent/bundle": "^0.15.1",
+        "css-browser-selector": "^0.6.5",
         "d3-array": "^2.8.0",
         "d3-axis": "^1.0.12",
         "d3-interpolate": "^1.4.0",
@@ -67,7 +68,7 @@
         "lodash.debounce": "^4.0.8",
         "lodash.throttle": "^4.1.1",
         "mathjax": "^3.1.2",
-        "protobufjs": "^6.10.1"
+        "protobufjs": "^6.10.2"
     },
     "files": [
         "dist/*"

ts/protobufjs.bzl

@@ -0,0 +1,29 @@
+load("//ts:copy.bzl", "copy_files")
+
+"Rule to copy protobufjs subset from node_modules to vendor folder."
+
+_include = [
+    "dist/protobuf.min.js",
+]
+
+_unwanted_prefix = "external/npm/node_modules/protobufjs/dist/"
+
+def _copy_protobufjs_impl(ctx):
+    wanted = []
+    for f in ctx.attr.protobufjs.files.to_list():
+        path = f.path
+        want = True
+
+        for substr in _include:
+            if substr in path:
+                output = path.replace(_unwanted_prefix, "")
+                wanted.append((f, output))
+
+    return copy_files(ctx, wanted)
+
+copy_protobufjs = rule(
+    implementation = _copy_protobufjs_impl,
+    attrs = {
+        "protobufjs": attr.label(default = "@npm//protobufjs:protobufjs__files"),
+    },
+)

ts/yarn.lock

@@ -756,6 +756,11 @@ cross-spawn@^7.0.1:
     shebang-command "^2.0.0"
     which "^2.0.1"
 
+css-browser-selector@^0.6.5:
+  version "0.6.5"
+  resolved "https://registry.yarnpkg.com/css-browser-selector/-/css-browser-selector-0.6.5.tgz#d2b06c01ff7d7cb455e2006b6b6558d39372ca60"
+  integrity sha1-0rBsAf99fLRV4gBra2VY05NyymA=
+
 csstype@^3.0.2:
   version "3.0.5"
   resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.5.tgz#7fdec6a28a67ae18647c51668a9ff95bb2fa7bb8"
@@ -2200,7 +2205,7 @@ protobufjs@6.8.8:
     "@types/node" "^10.1.0"
     long "^4.0.0"
 
-protobufjs@^6.10.1:
+protobufjs@^6.10.2:
   version "6.10.2"
   resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-6.10.2.tgz#b9cb6bd8ec8f87514592ba3fdfd28e93f33a469b"
   integrity sha512-27yj+04uF6ya9l+qfpH187aqEzfCF4+Uit0I9ZBQVqK09hk/SQzKa2MUqUpXaVa7LOFRg1TSSr3lVxGOk6c0SQ==