10.0 dependency (#5333)

* update requirments.txt

* update build json

* update webpack bundle version

Co-authored-by: shuntian <978987373@qq.com>

.github/workflows/dist.yml

@@ -18,13 +18,13 @@ jobs:
       - uses: actions/checkout@v1
       - uses: actions/setup-python@v1
         with:
-          python-version: "3.7"
+          python-version: "3.8"
       - uses: actions/setup-node@v1
         with:
           node-version: "10.x"
 
       - name: gettext for django
-        run: sudo apt-get install gettext python3-wheel
+        run: sudo apt-get install gettext python3-wheel libjwt-dev
 
       - name: Build dist branch
         run: |

.github/workflows/test.yml

@@ -11,7 +11,7 @@ jobs:
       - uses: actions/checkout@v1
       - uses: actions/setup-python@v1
         with:
-          python-version: "3.7"
+          python-version: "3.8"
 
       - name: apt install
         run: |

frontend/config/webpack.config.js

@@ -174,9 +174,9 @@ module.exports = function (webpackEnv) {
       // Point sourcemap entries to original disk location (format as URL on Windows)
       devtoolModuleFilenameTemplate: isEnvProduction
         ? info =>
-            path
+          path
-              .relative(paths.appSrc, info.absoluteResourcePath)
+            .relative(paths.appSrc, info.absoluteResourcePath)
-              .replace(/\\/g, '/')
+            .replace(/\\/g, '/')
         : isEnvDevelopment &&
           (info => path.resolve(info.absoluteResourcePath).replace(/\\/g, '/')),
       // Prevents conflicts when multiple webpack runtimes (from different apps)
@@ -260,13 +260,13 @@ module.exports = function (webpackEnv) {
             parser: safePostCssParser,
             map: shouldUseSourceMap
               ? {
-                  // `inline: false` forces the sourcemap to be output into a
+                // `inline: false` forces the sourcemap to be output into a
-                  // separate file
+                // separate file
-                  inline: false,
+                inline: false,
-                  // `annotation: true` appends the sourceMappingURL to the end of
+                // `annotation: true` appends the sourceMappingURL to the end of
-                  // the css file, helping the browser find the sourcemap
+                // the css file, helping the browser find the sourcemap
-                  annotation: true,
+                annotation: true,
-                }
+              }
               : false,
           },
           cssProcessorPluginOptions: {

frontend/package-lock.json

@@ -110,7 +110,7 @@
         "url-loader": "4.1.1",
         "web-vitals": "^0.2.4",
         "webpack": "4.44.2",
-        "webpack-bundle-tracker": "^0.4.3",
+        "webpack-bundle-tracker": "1.7.0",
         "webpack-dev-server": "3.11.0",
         "webpack-manifest-plugin": "2.2.0",
         "workbox-webpack-plugin": "5.1.4"
@@ -9159,14 +9159,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/deep-extend": {
-      "version": "0.6.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
     "node_modules/deep-is": {
       "version": "0.1.3",
       "license": "MIT"
@@ -16071,6 +16063,12 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/lodash.assign": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz",
+      "integrity": "sha512-hFuH8TY+Yji7Eja3mGiuAxBqLagejScbG8GbG0j6o9vzn0YL14My+ktnqtZgFTosKymC9/44wP6s7xyuLfnClw==",
+      "dev": true
+    },
     "node_modules/lodash.clonedeep": {
       "version": "4.5.0",
       "dev": true,
@@ -16080,11 +16078,35 @@
       "version": "4.0.8",
       "license": "MIT"
     },
+    "node_modules/lodash.defaults": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz",
+      "integrity": "sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ==",
+      "dev": true
+    },
     "node_modules/lodash.flatten": {
       "version": "4.4.0",
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/lodash.foreach": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.foreach/-/lodash.foreach-4.5.0.tgz",
+      "integrity": "sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==",
+      "dev": true
+    },
+    "node_modules/lodash.frompairs": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/lodash.frompairs/-/lodash.frompairs-4.0.1.tgz",
+      "integrity": "sha512-dvqe2I+cO5MzXCMhUnfYFa9MD+/760yx2aTAN1lqEcEkf896TxgrX373igVdqSJj6tQd0jnSLE1UMuKufqqxFw==",
+      "dev": true
+    },
+    "node_modules/lodash.get": {
+      "version": "4.4.2",
+      "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
+      "integrity": "sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==",
+      "dev": true
+    },
     "node_modules/lodash.isequal": {
       "version": "4.5.0",
       "license": "MIT"
@@ -16123,6 +16145,12 @@
       "version": "4.0.3",
       "license": "MIT"
     },
+    "node_modules/lodash.topairs": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/lodash.topairs/-/lodash.topairs-4.3.0.tgz",
+      "integrity": "sha512-qrRMbykBSEGdOgQLJJqVSdPWMD7Q+GJJ5jMRfQYb+LTLsw3tYVIabnCzRqTJb2WTo17PG5gNzXuFaZgYH/9SAQ==",
+      "dev": true
+    },
     "node_modules/lodash.truncate": {
       "version": "4.4.2",
       "dev": true,
@@ -24185,32 +24213,18 @@
       }
     },
     "node_modules/webpack-bundle-tracker": {
-      "version": "0.4.3",
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/webpack-bundle-tracker/-/webpack-bundle-tracker-1.7.0.tgz",
+      "integrity": "sha512-CwdFpeLcc4uBurgmtszCHW6ISJ5RN70jvGWnvUG/7LQS1gmv2g6IdYw9A8DvT4rydHzWnRFwqVsx1hN1IebkQA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "deep-extend": "^0.6.0",
+        "lodash.assign": "^4.2.0",
-        "mkdirp": "^0.5.1",
+        "lodash.defaults": "^4.2.0",
-        "strip-ansi": "^5.2.0"
+        "lodash.foreach": "^4.5.0",
-      }
+        "lodash.frompairs": "^4.0.1",
-    },
+        "lodash.get": "^4.4.2",
-    "node_modules/webpack-bundle-tracker/node_modules/ansi-regex": {
+        "lodash.topairs": "^4.3.0",
-      "version": "4.1.0",
+        "strip-ansi": "^6.0.0"
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/webpack-bundle-tracker/node_modules/strip-ansi": {
-      "version": "5.2.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-regex": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=6"
       }
     },
     "node_modules/webpack-dev-middleware": {
@@ -31797,10 +31811,6 @@
         "regexp.prototype.flags": "^1.2.0"
       }
     },
-    "deep-extend": {
-      "version": "0.6.0",
-      "dev": true
-    },
     "deep-is": {
       "version": "0.1.3"
     },
@@ -36384,6 +36394,12 @@
       "version": "3.0.0",
       "dev": true
     },
+    "lodash.assign": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz",
+      "integrity": "sha512-hFuH8TY+Yji7Eja3mGiuAxBqLagejScbG8GbG0j6o9vzn0YL14My+ktnqtZgFTosKymC9/44wP6s7xyuLfnClw==",
+      "dev": true
+    },
     "lodash.clonedeep": {
       "version": "4.5.0",
       "dev": true
@@ -36391,10 +36407,34 @@
     "lodash.debounce": {
       "version": "4.0.8"
     },
+    "lodash.defaults": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz",
+      "integrity": "sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ==",
+      "dev": true
+    },
     "lodash.flatten": {
       "version": "4.4.0",
       "dev": true
     },
+    "lodash.foreach": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.foreach/-/lodash.foreach-4.5.0.tgz",
+      "integrity": "sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==",
+      "dev": true
+    },
+    "lodash.frompairs": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/lodash.frompairs/-/lodash.frompairs-4.0.1.tgz",
+      "integrity": "sha512-dvqe2I+cO5MzXCMhUnfYFa9MD+/760yx2aTAN1lqEcEkf896TxgrX373igVdqSJj6tQd0jnSLE1UMuKufqqxFw==",
+      "dev": true
+    },
+    "lodash.get": {
+      "version": "4.4.2",
+      "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
+      "integrity": "sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==",
+      "dev": true
+    },
     "lodash.isequal": {
       "version": "4.5.0"
     },
@@ -36426,6 +36466,12 @@
     "lodash.tonumber": {
       "version": "4.0.3"
     },
+    "lodash.topairs": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/lodash.topairs/-/lodash.topairs-4.3.0.tgz",
+      "integrity": "sha512-qrRMbykBSEGdOgQLJJqVSdPWMD7Q+GJJ5jMRfQYb+LTLsw3tYVIabnCzRqTJb2WTo17PG5gNzXuFaZgYH/9SAQ==",
+      "dev": true
+    },
     "lodash.truncate": {
       "version": "4.4.2",
       "dev": true
@@ -42256,25 +42302,18 @@
       }
     },
     "webpack-bundle-tracker": {
-      "version": "0.4.3",
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/webpack-bundle-tracker/-/webpack-bundle-tracker-1.7.0.tgz",
+      "integrity": "sha512-CwdFpeLcc4uBurgmtszCHW6ISJ5RN70jvGWnvUG/7LQS1gmv2g6IdYw9A8DvT4rydHzWnRFwqVsx1hN1IebkQA==",
       "dev": true,
       "requires": {
-        "deep-extend": "^0.6.0",
+        "lodash.assign": "^4.2.0",
-        "mkdirp": "^0.5.1",
+        "lodash.defaults": "^4.2.0",
-        "strip-ansi": "^5.2.0"
+        "lodash.foreach": "^4.5.0",
-      },
+        "lodash.frompairs": "^4.0.1",
-      "dependencies": {
+        "lodash.get": "^4.4.2",
-        "ansi-regex": {
+        "lodash.topairs": "^4.3.0",
-          "version": "4.1.0",
+        "strip-ansi": "^6.0.0"
-          "dev": true
-        },
-        "strip-ansi": {
-          "version": "5.2.0",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^4.1.0"
-          }
-        }
       }
     },
     "webpack-dev-middleware": {

frontend/package.json

@@ -159,7 +159,7 @@
     "url-loader": "4.1.1",
     "web-vitals": "^0.2.4",
     "webpack": "4.44.2",
-    "webpack-bundle-tracker": "^0.4.3",
+    "webpack-bundle-tracker": "1.7.0",
     "webpack-dev-server": "3.11.0",
     "webpack-manifest-plugin": "2.2.0",
     "workbox-webpack-plugin": "5.1.4"

requirements.txt

@@ -1,26 +1,26 @@
-Django==3.2.14
+Django==3.2.16
-future
+django-statici18n==2.3.*
-captcha
+django_webpack_loader==1.7.*
-django-statici18n
+django_picklefield==3.1
-django-webpack_loader==0.7.0
+django_formtools==2.4
-gunicorn
+django_simple_captcha==0.5.*
-mysqlclient
+djangosaml2==1.5.*
-django-picklefield==2.1.1
+djangorestframework==3.14.*
-openpyxl
+python-dateutil==2.8.*
-qrcode
+pyjwt==2.6.*
-django-formtools==2.3
+pycryptodome==3.16.*
-django-simple-captcha
+python-cas==1.6.*
-djangorestframework==3.11.1
+pysaml2==7.2.*
-python-dateutil
+requests==2.28.*
-requests
+requests_oauthlib==1.3.*
-pillow
+future==0.18.*
-pyjwt==2.1.*
+gunicorn==20.1.*
-pycryptodome==3.12.0
+mysqlclient==2.1.*
-requests_oauthlib
+qrcode==7.3.*
-chardet
+pillow==9.3.*
-python-cas
+chardet==5.1.*
-djangosaml2==0.20.0
+cffi==1.15.1
-pysaml2==6.5.1
+captcha==0.4
-cffi==1.14.0
+openpyxl==3.0.*
-Markdown
+Markdown==3.4.*
-bleach
+bleach==5.0.*

seahub/templates/base_for_react.html

@@ -19,7 +19,6 @@
 <link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}css/sf_font3/iconfont.css" />
 <link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}css/seafile-ui.css" />
 <link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}css/seahub_react.css?t=1398068110" />
-{% render_bundle 'commons' 'css'%}
 {% block extra_style %}{% endblock %}
 {% if branding_css != '' %}<link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}{{ branding_css }}" />{% endif %}
 {% if enable_branding_css %}<link rel="stylesheet" type="text/css" href="{% url 'custom_css' %}" />{% endif %}
@@ -147,8 +146,6 @@
      };
 </script>
 <script src="{{ STATIC_URL }}scripts/i18n/{{ LANGUAGE_CODE }}/djangojs.js?v={{ seafile_version }}"></script>
-{% render_bundle 'commons' 'js' %}
-{% render_bundle 'runtime' %}
 {% block extra_script %}{% endblock %}
 </body>
 </html>

seahub/templates/markdown_file_view_react.html

@@ -13,7 +13,6 @@
         <link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}css/seafile-editor-font/seafile-editor-font.css" />
         <link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}css/seafile-ui.css" />
         <link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}css/seahub_react.css?t=1398068110" />
-        {% render_bundle 'commons' 'css' %}
         {% render_bundle 'markdownEditor' 'css' %}
         <link rel="stylesheet" type="text/css" media="print" href="{{ MEDIA_URL }}css/print_for_md_file_view.css" />
         {% if branding_css != '' %}<link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}{{ branding_css }}" />{% endif %}
@@ -69,8 +68,6 @@
          </script>
          <script src="{{ STATIC_URL }}scripts/i18n/{{ LANGUAGE_CODE }}/djangojs.js?v={{ seafile_version }}"></script>
 
-         {% render_bundle 'commons' 'js' %}
-         {% render_bundle 'runtime' 'js' %}
          {% render_bundle 'markdownEditor' 'js' %}
     </body>
 </html>

tests/seahubtests.sh

@@ -28,7 +28,7 @@ SEAHUB_TESTSDIR=$(python -c "import os; print(os.path.dirname(os.path.realpath('
 SEAHUB_SRCDIR=$(dirname "${SEAHUB_TESTSDIR}")
 
 export SEAHUB_LOG_DIR='/tmp/logs'
-export PYTHONPATH="/usr/local/lib/python3.7/site-packages:/usr/local/lib/python3.7/dist-packages:/usr/lib/python3.7/site-packages:/usr/lib/python3.7/dist-packages:${SEAHUB_SRCDIR}/thirdpart:${PYTHONPATH}"
+export PYTHONPATH="/usr/local/lib/python3.8/site-packages:/usr/local/lib/python3.8/dist-packages:/usr/lib/python3.8/site-packages:/usr/lib/python3.8/dist-packages:${SEAHUB_SRCDIR}/thirdpart:${PYTHONPATH}"
 cd "$SEAHUB_SRCDIR"
 set +x