Bump yarn packages (webpacker, bootstrap, ...) (#222)

* Specify exact versions in package.json

* Bump @rails packages to 6.1.7-3

* Bump decode-uri-component from 0.2.0 to 0.2.2 (#176)

Bumps [decode-uri-component](https://github.com/SamVerschueren/decode-uri-component) from 0.2.0 to 0.2.2.
- [Release notes](https://github.com/SamVerschueren/decode-uri-component/releases)
- [Commits](https://github.com/SamVerschueren/decode-uri-component/compare/v0.2.0...v0.2.2)

---
updated-dependencies:
- dependency-name: decode-uri-component
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump qs from 6.5.2 to 6.5.3 (#177)

Bumps [qs](https://github.com/ljharb/qs) from 6.5.2 to 6.5.3.
- [Release notes](https://github.com/ljharb/qs/releases)
- [Changelog](https://github.com/ljharb/qs/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ljharb/qs/compare/v6.5.2...v6.5.3)

---
updated-dependencies:
- dependency-name: qs
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump express from 4.17.1 to 4.18.2 (#178)

Bumps [express](https://github.com/expressjs/express) from 4.17.1 to 4.18.2.
- [Release notes](https://github.com/expressjs/express/releases)
- [Changelog](https://github.com/expressjs/express/blob/master/History.md)
- [Commits](https://github.com/expressjs/express/compare/4.17.1...4.18.2)

---
updated-dependencies:
- dependency-name: express
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump json5 from 1.0.1 to 1.0.2 (#182)

Bumps [json5](https://github.com/json5/json5) from 1.0.1 to 1.0.2.
- [Release notes](https://github.com/json5/json5/releases)
- [Changelog](https://github.com/json5/json5/blob/main/CHANGELOG.md)
- [Commits](https://github.com/json5/json5/compare/v1.0.1...v1.0.2)

---
updated-dependencies:
- dependency-name: json5
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump minimatch from 3.0.4 to 3.0.8 (#223)

Bumps [minimatch](https://github.com/isaacs/minimatch) from 3.0.4 to 3.0.8.
- [Changelog](https://github.com/isaacs/minimatch/blob/main/changelog.md)
- [Commits](https://github.com/isaacs/minimatch/compare/v3.0.4...v3.0.8)

---
updated-dependencies:
- dependency-name: minimatch
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump @rails/webpacker to 5.1.0

* Fix translations import in application.js

* Bump @rails/webpacker to 5.4.4

* Set some babel plugins loose=true to suppress warnings

* Bump boostrap to 4.6.2 and popper.js to 1.16.1

* Fix CSS after bootstrap bump

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Gemfile

@@ -11,7 +11,7 @@ gem 'pg', '1.3.5'
 
 gem 'puma', '4.3.12'
 
-gem 'webpacker', '4.3.0'
+gem 'webpacker', '5.4.4'
 
 gem 'turbolinks', '5.2.1'
 

Gemfile.lock

@@ -128,9 +128,9 @@ GEM
     listen (3.5.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    loofah (2.20.0)
+    loofah (2.21.2)
       crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
+      nokogiri (>= 1.12.0)
     mail (2.8.1)
       mini_mime (>= 0.1.1)
       net-imap
@@ -154,7 +154,7 @@ GEM
     net-smtp (0.3.3)
       net-protocol
     nio4r (2.5.9)
-    nokogiri (1.14.3)
+    nokogiri (1.14.4)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     orm_adapter (0.5.0)
@@ -166,7 +166,7 @@ GEM
       activesupport (>= 3.0.0)
     racc (1.6.2)
     rack (2.2.7)
-    rack-proxy (0.7.2)
+    rack-proxy (0.7.6)
       rack
     rack-test (2.1.0)
       rack (>= 1.3)
@@ -233,6 +233,7 @@ GEM
       childprocess (>= 0.5, < 5.0)
       rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2)
+    semantic_range (3.0.0)
     spring (2.1.1)
     spring-watcher-listen (2.0.1)
       listen (>= 2.7, < 4.0)
@@ -244,7 +245,7 @@ GEM
       actionpack (>= 5.2)
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
-    thor (1.2.1)
+    thor (1.2.2)
     tilt (2.0.10)
     timeout (0.3.2)
     turbolinks (5.2.1)
@@ -263,10 +264,11 @@ GEM
       nokogiri (~> 1.6)
       rubyzip (>= 1.3.0)
       selenium-webdriver (~> 4.0)
-    webpacker (4.3.0)
+    webpacker (5.4.4)
-      activesupport (>= 4.2)
+      activesupport (>= 5.2)
       rack-proxy (>= 0.6.1)
-      railties (>= 4.2)
+      railties (>= 5.2)
+      semantic_range (>= 2.3.0)
     websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
@@ -302,7 +304,7 @@ DEPENDENCIES
   tzinfo-data
   web-console (>= 3.3.0)
   webdrivers (= 5.0.0)
-  webpacker (= 4.3.0)
+  webpacker (= 5.4.4)
 
 RUBY VERSION
    ruby 3.0.6p216

app/javascript/components/SiteSettings/Boards/BoardEditable.tsx

@@ -6,7 +6,6 @@ import { DescriptionText } from '../../common/CustomTexts';
 
 import DragZone from '../../common/DragZone';
 import PostBoardLabel from '../../common/PostBoardLabel';
-import Separator from '../../common/Separator';
 import BoardForm from './BoardForm';
 import ActionLink from '../../common/ActionLink';
 import { CancelIcon, DeleteIcon, EditIcon } from '../../common/Icons';

app/javascript/packs/application.js

@@ -8,6 +8,9 @@ require("turbolinks").start()
 require("@rails/activestorage").start()
 require("channels")
 
+// i18n-js translations
+require('translations/index.js.erb')
+
 require("./bootstrap_custom")
 require("../stylesheets/main")
 require("../images/favicon.png")
@@ -23,5 +26,3 @@ require("../images/logo.png")
 var componentRequireContext = require.context("components", true);
 var ReactRailsUJS = require("react_ujs");
 ReactRailsUJS.useContext(componentRequireContext);
-
-import I18n from 'translations/index.js.erb'

app/javascript/stylesheets/common/_index.scss

@@ -190,6 +190,7 @@
 }
 
 .actionLink {
+  color: $astuto-black;
   display: flex;
   cursor: pointer;
   align-self: center;

app/views/layouts/_header.html.erb

@@ -30,7 +30,7 @@
     <div class="collapse navbar-collapse" id="navbarSupportedContent">
       <ul class="boardsNav">
         <% if @tenant_setting.show_roadmap_in_header %>
-          <li class="nav-item<%= current_page?(roadmap_path) ? ' active' : '' %>">
+          <li class="nav-item<%= (current_page?(roadmap_path) or (@tenant_setting.root_board_id == 0 and current_page?(root_path))) ? ' active' : '' %>">
             <%= link_to "Roadmap", roadmap_path, class: 'nav-link' %>
           </li>
         <% end %>

babel.config.js

@@ -41,6 +41,13 @@ module.exports = function(api) {
           development: isDevelopmentEnv || isTestEnv,
           useBuiltIns: true
         }
+      ],
+      [
+        '@babel/preset-typescript',
+        {
+          'allExtensions': true,
+          'isTSX': true
+        }
       ]
     ].filter(Boolean),
     plugins: [
@@ -48,6 +55,18 @@ module.exports = function(api) {
       require('@babel/plugin-syntax-dynamic-import').default,
       isTestEnv && require('babel-plugin-dynamic-import-node'),
       require('@babel/plugin-transform-destructuring').default,
+      [
+        require('@babel/plugin-proposal-private-methods').default,
+        {
+          loose: true
+        }
+      ],
+      [
+        require('@babel/plugin-proposal-private-property-in-object').default,
+        {
+          loose: true
+        }
+      ],
       [
         require('@babel/plugin-proposal-class-properties').default,
         {

bin/webpack

@@ -7,7 +7,6 @@ require "pathname"
 ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
   Pathname.new(__FILE__).realpath)
 
-require "rubygems"
 require "bundler/setup"
 
 require "webpacker"

bin/webpack-dev-server

@@ -7,7 +7,6 @@ require "pathname"
 ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
   Pathname.new(__FILE__).realpath)
 
-require "rubygems"
 require "bundler/setup"
 
 require "webpacker"

config/webpack/environment.js

@@ -1,9 +1,7 @@
 const { environment } = require('@rails/webpacker')
 const erb = require('./loaders/erb')
-const typescript =  require('./loaders/typescript')
 const webpack = require('webpack')
 
-environment.loaders.prepend('typescript', typescript)
 environment.plugins.append(
   'Provide',
   new webpack.ProvidePlugin({

config/webpack/loaders/typescript.js

@@ -1,11 +0,0 @@
-const PnpWebpackPlugin = require('pnp-webpack-plugin')
-
-module.exports = {
-  test: /\.(ts|tsx)?(\.erb)?$/,
-  use: [
-    {
-      loader: 'ts-loader',
-      options: PnpWebpackPlugin.tsLoaderOptions()
-    }
-  ]
-}

package.json

@@ -3,38 +3,38 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
-    "@babel/preset-react": "^7.0.0",
+    "@babel/preset-react": "7.0.0",
-    "@rails/actioncable": "6.0.5",
+    "@babel/preset-typescript": "^7.21.5",
-    "@rails/activestorage": "6.0.5",
+    "@rails/actioncable": "6.1.7-3",
-    "@rails/ujs": "6.0.5",
+    "@rails/activestorage": "6.1.7-3",
-    "@rails/webpacker": "4.3.0",
+    "@rails/ujs": "6.1.7-3",
-    "@types/react": "^16.9.2",
+    "@rails/webpacker": "5.4.4",
-    "@types/react-dom": "^16.9.0",
+    "@types/react": "16.9.2",
-    "babel-plugin-transform-react-remove-prop-types": "^0.4.24",
+    "@types/react-dom": "16.9.0",
-    "bootstrap": "4.3.1",
+    "babel-plugin-transform-react-remove-prop-types": "0.4.24",
-    "i18n-js": "^3.9.2",
+    "bootstrap": "4.6.2",
-    "jquery": "^3.5.1",
+    "i18n-js": "3.9.2",
-    "popper.js": "^1.15.0",
+    "jquery": "3.5.1",
-    "prop-types": "^15.7.2",
+    "popper.js": "1.16.1",
-    "rails-erb-loader": "^5.5.2",
+    "prop-types": "15.7.2",
-    "react": "^16.9.0",
+    "rails-erb-loader": "5.5.2",
-    "react-beautiful-dnd": "^13.1.0",
+    "react": "16.9.0",
-    "react-dom": "^16.9.0",
+    "react-beautiful-dnd": "13.1.0",
-    "react-gravatar": "^2.6.3",
+    "react-dom": "16.9.0",
+    "react-gravatar": "2.6.3",
     "react-hook-form": "7.33.1",
     "react-icons": "4.4.0",
-    "react-infinite-scroller": "^1.2.4",
+    "react-infinite-scroller": "1.2.4",
-    "react-markdown": "^5.0.3",
+    "react-markdown": "5.0.3",
-    "react-redux": "^7.1.1",
+    "react-redux": "7.1.1",
-    "react_ujs": "^2.6.0",
+    "react_ujs": "2.6.0",
-    "redux": "^4.0.4",
+    "redux": "4.0.4",
-    "redux-thunk": "^2.3.0",
+    "redux-thunk": "2.3.0",
-    "ts-loader": "8.1.0",
+    "turbolinks": "5.2.0",
-    "turbolinks": "^5.2.0",
     "typescript": "4.3.2"
   },
   "devDependencies": {
-    "@types/react-redux": "^7.1.3",
+    "@types/react-redux": "7.1.3",
     "webpack-dev-server": "3.11.0"
   }
 }