Merge tag 'debian/13.4.7-2' into buster-fasttrack

gitlab Debian release 13.4.7-2

debian/changelog

@@ -1,3 +1,15 @@
+gitlab (13.4.7-2) unstable; urgency=medium
+
+  [ Sruthi Chandran ]
+  * Add canvas as externals in webpack.config.js
+
+  [ Pirate Praveen ]
+  * Use packaged versions of uuid, mermaid, katex, minimatch, js-yaml,
+    webpack-stats-plugin and font-awesome node modules
+  * Tighten dependency on node-autosize for bug fix (error in browser console)
+
+ -- Pirate Praveen <praveen@debian.org>  Thu, 17 Dec 2020 16:14:45 +0530
+
 gitlab (13.4.7-1~fto10+1) buster-fasttrack; urgency=medium
 
   * Rebuild for buster-fasttrack.

debian/control

@@ -357,7 +357,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
  ruby-yajl (>= 1.4.1~),
  ruby-webauthn (>= 2.3~),
 # packaged node modules - all node packages are not packaged yet
- node-autosize (>= 4.0~),
+ node-autosize (>= 4.0.2~dfsg1-5~),
  node-axios (>= 0.17.1~),
  node-babel7,
  node-babel-loader (>= 8.0~),
@@ -380,6 +380,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
  node-exports-loader (>= 0.7~),
  node-imports-loader (>= 0.8~),
  node-file-loader (>= 5.0~),
+ node-font-awesome,
  node-fuzzaldrin-plus (>= 0.5~),
  node-glob (>= 7.1.6~),
  node-jed,
@@ -388,10 +389,14 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
 # Broken
 # node-jquery.waitforimages,
  node-js-cookie,
+ node-js-yaml (>= 3.13.1~),
  node-jszip,
  node-jszip-utils,
+ node-katex,
  node-lodash (>= 4.17.15~),
  node-marked (>= 0.3~),
+ node-mermaid,
+ node-minimatch,
  node-mousetrap,
  node-pdfjs-dist,
 # Include node-pikaday only after @gitlab/ui is accepted
@@ -408,6 +413,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
  node-timeago.js (>= 4.0~),
  node-underscore (>= 1.9~),
  node-url-loader (>= 3.0~),
+ node-uuid (>= 8.1~),
  node-vue (>= 2.6.10~),
  node-vue-resource (>= 1.5.1~),
 # Blocked by #927254

debian/patches/0740-use-packaged-modules.patch

@@ -130,13 +130,13 @@ Use debian packaged node modules when available
      "diff": "^3.4.0",
      "document-register-element": "1.14.3",
      "dompurify": "^2.0.11",
-@@ -85,81 +62,53 @@
+@@ -85,81 +62,46 @@
      "editorconfig": "^0.15.3",
      "emoji-regex": "^7.0.3",
      "emoji-unicode-version": "^0.2.1",
 -    "exports-loader": "^0.7.0",
 -    "file-loader": "^5.1.0",
-     "font-awesome": "4.7.0",
+-    "font-awesome": "4.7.0",
      "fuzzaldrin-plus": "^0.6.0",
 -    "glob": "^7.1.6",
      "graphql": "^14.7.0",
@@ -152,16 +152,16 @@ Use debian packaged node modules when available
      "jquery.caret": "^0.3.1",
      "jquery.waitforimages": "^2.2.0",
 -    "js-cookie": "^2.2.1",
-     "js-yaml": "^3.13.1",
+-    "js-yaml": "^3.13.1",
 -    "jszip": "^3.1.3",
 -    "jszip-utils": "^0.0.2",
-     "katex": "^0.10.0",
+-    "katex": "^0.10.0",
 -    "lodash": "^4.17.20",
 +    "loader-utils": "^2.0.0",
      "marked": "^0.3.12",
-     "mermaid": "^8.5.2",
+-    "mermaid": "^8.5.2",
      "mersenne-twister": "1.1.0",
-     "minimatch": "^3.0.4",
+-    "minimatch": "^3.0.4",
      "miragejs": "^0.1.40",
 +    "mkdirp": "^1.0.4",
      "mock-apollo-client": "^0.4.0",
@@ -194,7 +194,7 @@ Use debian packaged node modules when available
      "tiptap-extensions": "^1.8.0",
      "tributejs": "5.1.3",
 -    "url-loader": "^3.0.0",
-     "uuid": "8.1.0",
+-    "uuid": "8.1.0",
      "visibilityjs": "^1.2.4",
 -    "vue": "^2.6.10",
      "vue-apollo": "^3.0.3",
@@ -204,14 +204,14 @@ Use debian packaged node modules when available
      "vue-virtual-scroll-list": "^1.4.4",
      "vuedraggable": "^2.23.0",
      "vuex": "^3.5.1",
-     "web-vitals": "^0.2.4",
+-    "web-vitals": "^0.2.4",
 -    "webpack": "^4.42.0",
 -    "webpack-bundle-analyzer": "^3.6.0",
 -    "webpack-cli": "^3.3.11",
 -    "webpack-stats-plugin": "^0.3.1",
 -    "worker-loader": "^2.0.0",
 -    "xterm": "3.14.5"
-+    "webpack-stats-plugin": "^0.3.1"
++    "web-vitals": "^0.2.4"
    },
    "devDependencies": {
    },
@@ -240,3 +240,14 @@ Use debian packaged node modules when available
  
  import page from './page/index.vue';
  
+--- a/config/application.rb
++++ b/config/application.rb
+@@ -203,7 +203,7 @@
+     config.assets.precompile << "illustrations/*.svg"
+ 
+     # Import Fontawesome fonts
+-    config.assets.paths << "#{config.root}/node_modules/font-awesome/fonts"
++    config.assets.paths << "/usr/share/nodejs/font-awesome/fonts"
+     config.assets.precompile << "fontawesome-webfont.woff2"
+     config.assets.precompile << "fontawesome-webfont.woff"
+ 

debian/patches/0780-css-loader-3.patch

@@ -11,7 +11,7 @@ Subject: [PATCH] Update css-loader node module 2.1.1 -> 3.2.1
 
 --- a/config/webpack.config.js
 +++ b/config/webpack.config.js
-@@ -252,8 +252,10 @@
+@@ -254,8 +254,10 @@
            {
              loader: 'css-loader',
              options: {

debian/patches/0790-worker-loader-3.patch

@@ -11,7 +11,7 @@ Subject: [PATCH] Update worker-loader from 2.x to 3.x
 
 --- a/config/webpack.config.js
 +++ b/config/webpack.config.js
-@@ -230,8 +230,8 @@
+@@ -232,8 +232,8 @@
            {
              loader: 'worker-loader',
              options: {

debian/patches/0791-update-uuid.patch

@@ -1,11 +0,0 @@
---- a/package.json
-+++ b/package.json
-@@ -99,7 +99,7 @@
-     "tiptap-commands": "^1.4.0",
-     "tiptap-extensions": "^1.8.0",
-     "tributejs": "5.1.3",
--    "uuid": "8.1.0",
-+    "uuid": "^8.3.1",
-     "visibilityjs": "^1.2.4",
-     "vue-apollo": "^3.0.3",
-     "vue-loader": "^15.9.0",

debian/patches/series

@@ -31,4 +31,3 @@
 0770-remove-capybara-screenshot-rspec.patch
 0780-css-loader-3.patch
 0790-worker-loader-3.patch
-0791-update-uuid.patch