diff --git a/frontend/config/webpack.config.js b/frontend/config/webpack.config.js
index 151b3c025d..851e494018 100644
--- a/frontend/config/webpack.config.js
+++ b/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
- .relative(paths.appSrc, info.absoluteResourcePath)
- .replace(/\\/g, '/')
+ path
+ .relative(paths.appSrc, info.absoluteResourcePath)
+ .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
- // separate file
- inline: false,
- // `annotation: true` appends the sourceMappingURL to the end of
- // the css file, helping the browser find the sourcemap
- annotation: true,
- }
+ // `inline: false` forces the sourcemap to be output into a
+ // separate file
+ inline: false,
+ // `annotation: true` appends the sourceMappingURL to the end of
+ // the css file, helping the browser find the sourcemap
+ annotation: true,
+ }
: false,
},
cssProcessorPluginOptions: {
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 242304a412..acefb75f51 100644
--- a/frontend/package-lock.json
+++ b/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",
- "mkdirp": "^0.5.1",
- "strip-ansi": "^5.2.0"
- }
- },
- "node_modules/webpack-bundle-tracker/node_modules/ansi-regex": {
- "version": "4.1.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"
+ "lodash.assign": "^4.2.0",
+ "lodash.defaults": "^4.2.0",
+ "lodash.foreach": "^4.5.0",
+ "lodash.frompairs": "^4.0.1",
+ "lodash.get": "^4.4.2",
+ "lodash.topairs": "^4.3.0",
+ "strip-ansi": "^6.0.0"
}
},
"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",
- "mkdirp": "^0.5.1",
- "strip-ansi": "^5.2.0"
- },
- "dependencies": {
- "ansi-regex": {
- "version": "4.1.0",
- "dev": true
- },
- "strip-ansi": {
- "version": "5.2.0",
- "dev": true,
- "requires": {
- "ansi-regex": "^4.1.0"
- }
- }
+ "lodash.assign": "^4.2.0",
+ "lodash.defaults": "^4.2.0",
+ "lodash.foreach": "^4.5.0",
+ "lodash.frompairs": "^4.0.1",
+ "lodash.get": "^4.4.2",
+ "lodash.topairs": "^4.3.0",
+ "strip-ansi": "^6.0.0"
}
},
"webpack-dev-middleware": {
diff --git a/frontend/package.json b/frontend/package.json
index 637153141b..589d7b7a81 100644
--- a/frontend/package.json
+++ b/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"
diff --git a/seahub/templates/base_for_react.html b/seahub/templates/base_for_react.html
index 897dd8fd6a..6b0b5dd712 100644
--- a/seahub/templates/base_for_react.html
+++ b/seahub/templates/base_for_react.html
@@ -19,7 +19,6 @@
-{% render_bundle 'commons' 'css'%}
{% block extra_style %}{% endblock %}
{% if branding_css != '' %}{% endif %}
{% if enable_branding_css %}{% endif %}
@@ -147,8 +146,6 @@
};
-{% render_bundle 'commons' 'js' %}
-{% render_bundle 'runtime' %}
{% block extra_script %}{% endblock %}