Merge pull request #1264 from glowing-bear/lorenz/release-0.10.0

Get ready to release v0.10.0

.gitignore

@@ -6,3 +6,5 @@ build/
 
 # IntelliJ / WebStorm
 .idea/
+
+src-tauri/target

package.json

@@ -1,30 +1,31 @@
 {
   "name": "glowing-bear",
   "private": true,
-  "version": "0.10.0",
+  "version": "0.11.0",
   "description": "A web client for Weechat",
   "repository": "https://github.com/glowing-bear/glowing-bear",
   "license": "GPLv3",
   "devDependencies": {
-    "@babel/core": "^7.16.12",
-    "@babel/preset-env": "^7.16.11",
-    "@tauri-apps/cli": "^1.0.0-rc.5",
+    "@babel/core": "^7.22.7",
+    "@babel/preset-env": "^7.22.7",
+    "@tauri-apps/cli": "^1.4.0",
     "angular-mocks": "^1.8.3",
-    "babel-loader": "^8.2.3",
-    "copy-webpack-plugin": "^10.2.1",
-    "html-webpack-plugin": "^5.5.0",
-    "jasmine-core": "^3.99.0",
-    "jshint": "^2.13.3",
-    "karma": "^6.3.16",
-    "karma-chrome-launcher": "^3.1.0",
-    "karma-jasmine": "~3.1",
-    "karma-junit-reporter": "~2.0",
+    "babel-loader": "^9.1.3",
+    "copy-webpack-plugin": "^11.0.0",
+    "html-webpack-plugin": "^5.5.3",
+    "jasmine-core": "^5.0.1",
+    "jshint": "^2.13.6",
+    "karma": "^6.4.2",
+    "karma-chrome-launcher": "^3.2.0",
+    "karma-jasmine": "^5.1.0",
+    "karma-junit-reporter": "^2.0.1",
     "karma-webpack": "^5.0.0",
-    "linkifyjs": "^2.1.9",
+    "linkifyjs": "^4.1.1",
+    "linkify-string": "^4.1.1",
     "protractor": "^7.0.0",
-    "webpack": "^5.76.0",
-    "webpack-cli": "^4.9.1",
-    "webpack-dev-server": "^4.7.3"
+    "webpack": "^5.88.1",
+    "webpack-cli": "^5.1.4",
+    "webpack-dev-server": "^4.15.1"
   },
   "scripts": {
     "build": "webpack",
@@ -48,7 +49,6 @@
     "bootstrap": "^3.4.1",
     "emojione": "^4.5.0",
     "favico.js": "^0.3.10",
-    "jquery-linkify": "^2.2.1",
     "zlibjs": "^0.3.1"
   }
 }

src-tauri/Cargo.toml

@@ -1,18 +1,18 @@
 [package]
 name = "glowing-bear"
-version = "0.10.0" #sync to ../package.json
+version = "0.11.0" #sync to ../package.json
 description = "A web client for WeeChat"
 authors = ["glowing-bear-contributors"]
 license = "GPL-3.0"
 repository = "https://github.com/glowing-bear/glowing-bear"
 default-run = "glowing-bear"
 edition = "2021"
-rust-version = "1.57"
+rust-version = "1.63"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [build-dependencies]
-tauri-build = { version = "1.2.1", features = [] }
+tauri-build = { version = "1.4.0", features = [] }
 
 [dependencies]
 serde_json = "1.0"

src-tauri/tauri.conf.json

@@ -8,7 +8,7 @@
   },
   "package": {
     "productName": "glowing-bear",
-    "version": "0.10.0"
+    "version": "0.11.0"
   },
   "tauri": {
     "allowlist": {

src/index.html

@@ -432,7 +432,7 @@ chown -R <strong>username</strong>:<strong>username</strong> ~<strong>username</
         <div class="modal-content">
           <div class="modal-header">
             <button type="button" class="close" ng-click="closeModal($event)" aria-hidden="true">&times;</button>
-            <span class="pull-right version">Glowing Bear version 0.10.0</span>
+            <span class="pull-right version">Glowing Bear version 0.11.0</span>
             <h4 class="modal-title">Settings</h4>
             <p>Settings will be stored in your browser.</p>
           </div>

src/js/glowingbear.js

@@ -131,7 +131,7 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
     // Show a TLS warning if GB was loaded over an unencrypted connection,
     // except for local instances (local files, testing)
     $scope.show_tls_warning = (["https:", "file:"].indexOf(window.location.protocol) === -1) &&
-        (["localhost", "127.0.0.1", "::1"].indexOf(window.location.hostname) === -1)
+        (["localhost", "127.0.0.1", "::1"].indexOf(window.location.hostname) === -1);
 
     $rootScope.isWindowFocused = function() {
         if (typeof $scope.documentHidden === "undefined") {

src/js/plugins.js

@@ -239,34 +239,35 @@ plugins.factory('userPlugins', function() {
 	
     var twitchPlugin = new UrlPlugin('Twitch video', function(url) {
         var regex = /(?:https?:\/\/)?clips\.twitch\.tv\/([^\?\&\/\s]+)/i,
-            match = url.match(regex);
+            match = url.match(regex),
+            embedurl,
+            element;
 
-        if (match){
+        if (match) {
             var clipId = match[1];
-            var embedurl = "https://clips.twitch.tv/embed?clip=" + clipId + "&parent=" + window.location.hostname;
-
-            var element = angular.element('<iframe></iframe>')
-                    .attr('src', embedurl)
-                    .attr('width', '560')
-                    .attr('height', '315')
-                    .attr('allowfullscreen', 'true');
+            embedurl = "https://clips.twitch.tv/embed?clip=" + clipId + "&parent=" + window.location.hostname;
+            element = angular.element('<iframe></iframe>')
+                .attr('src', embedurl)
+                .attr('width', '560')
+                .attr('height', '315')
+                .attr('allowfullscreen', 'true');
             return element.prop('outerHTML');
         }
-		
-		var regex = /(?:https?:(?:\/\/www\.)?)?twitch\.tv\/(?:videos\/(\d+)|(\w+))/i,
-            match = url.match(regex);
+
+	regex = /(?:https?:(?:\/\/www\.)?)?twitch\.tv\/(?:videos\/(\d+)|(\w+))/i;
+        match = url.match(regex);
         if (match) {
-			var mediaType = "video";
-			if(match[1] === undefined) {
-				mediaType = "channel";
-			}
-			var mediaId = match[1] === undefined ? match[2] : match[1];
-			var embedurl = "https://player.twitch.tv/?" + mediaType + "=" + mediaId + "&parent=" + window.location.hostname + "&autoplay=false&muted=true";
-            var element = angular.element('<iframe></iframe>')
-                    .attr('src', embedurl)
-                    .attr('width', '560')
-                    .attr('height', '315')
-                    .attr('allowfullscreen', 'true');
+	    var mediaType = "video";
+	    if (match[1] === undefined) {
+		mediaType = "channel";
+	    }
+	    var mediaId = match[1] === undefined ? match[2] : match[1];
+	    embedurl = "https://player.twitch.tv/?" + mediaType + "=" + mediaId + "&parent=" + window.location.hostname + "&autoplay=false&muted=true";
+            element = angular.element('<iframe></iframe>')
+                .attr('src', embedurl)
+                .attr('width', '560')
+                .attr('height', '315')
+                .attr('allowfullscreen', 'true');
             return element.prop('outerHTML');
         }
     });

src/js/utils.js

@@ -27,7 +27,7 @@ weechat.factory('utils', function() {
     const _isTauri = window.__TAURI__ !== undefined;
     var isTauri = function() {
         return _isTauri;
-    }
+    };
 
     // Inject a javascript (used by KaTeX)
     var inject_script = function(script_url) {

src/manifest.json

@@ -1,7 +1,7 @@
 {
   "name": "Glowing Bear",
   "description": "WeeChat Web frontend",
-  "version": "0.10.0",
+  "version": "0.11.0",
   "manifest_version": 2,
   "icons": {
     "32": "assets/img/favicon.png",

src/manifest.webapp

@@ -25,5 +25,5 @@
       "desktop-notification":{}
   },
   "default_locale": "en",
-  "version": "0.10.0"
+  "version": "0.11.0"
 }

test/karma.conf.js

@@ -7,7 +7,7 @@ module.exports = function (config) {
 
     files: [
       'node_modules/linkifyjs/dist/linkify.js',
-      'node_modules/linkifyjs/dist/linkify-string.js',
+      'node_modules/linkify-string/dist/linkify-string.js',
       'test/unit/main.test.js'
     ],
 

webpack.config.js

@@ -51,7 +51,7 @@ module.exports = {
                 },
                 { from: "../node_modules/emojione/lib/js/emojione.min.js" },
                 { from: "../node_modules/linkifyjs/dist/linkify.min.js" },
-                { from: "../node_modules/linkifyjs/dist/linkify-string.min.js" },
+                { from: "../node_modules/linkify-string/dist/linkify-string.min.js" },
             ]
         }),
     ],