engineering/unrhodecode
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request !2916 from rhodecode-enterprise-ce feature/RCCE-343_Lazy-load-CodeMirror

Browse source 
Changes from branch: Feature/RCCE 343 Lazy load CodeMirror
This commit is contained in:
Andrii Verbytskyi 2025-12-11 11:48:03 +00:00
commit 203ea853e4
9 changed files with 610 additions and 443 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -45,6 +45,8 @@ rhodecode/public/js/src/components/**/*.css
/rhodecode/public/js/rhodecode-components.js
/rhodecode/public/js/scripts.js
/rhodecode/public/js/scripts.min.js
/rhodecode/public/js/codemirror-dist.js
/rhodecode/public/js/codemirror-dist.min.js
/rhodecode/public/js/src/components/root-styles.gen.html
/rhodecode/public/js/vendors/webcomponentsjs/
/rhodecode.db

2
Gruntfile.js
View file

@ -18,5 +18,5 @@ module.exports = function(grunt) {
grunt.loadNpmTasks('grunt-contrib-jshint');
grunt.loadNpmTasks('grunt-contrib-copy');
grunt.loadNpmTasks('grunt-webpack');
grunt.registerTask('default', ['less:production', 'less:components', 'copy', 'webpack', 'concat:dist', 'terser:dist']);
grunt.registerTask('default', ['less:production', 'less:components', 'copy', 'webpack', 'concat:dist', 'concat:ext', 'terser:dist', 'terser:ext']);
};

72
grunt_config.json
View file

@ -64,14 +64,6 @@
"<%= dirs.js.src %>/plugins/jquery.timeago.js",
"<%= dirs.js.src %>/plugins/jquery.timeago-extension.js",
"<%= dirs.js.src %>/select2/select2.js",
"<%= dirs.js.src %>/codemirror/codemirror.js",
"<%= dirs.js.src %>/codemirror/codemirror_loadmode.js",
"<%= dirs.js.src %>/codemirror/codemirror_hint.js",
"<%= dirs.js.src %>/codemirror/codemirror_overlay.js",
"<%= dirs.js.src %>/codemirror/codemirror_placeholder.js",
"<%= dirs.js.src %>/codemirror/codemirror_simplemode.js",
"<%= dirs.js.dest %>/mode/meta.js",
"<%= dirs.js.dest %>/mode/meta_ext.js",
"<%= dirs.js.src_rc %>/i18n/select2/translations.js",
"<%= dirs.js.src %>/rhodecode/utils/array.js",
"<%= dirs.js.src %>/rhodecode/utils/string.js",
@ -84,7 +76,6 @@
"<%= dirs.js.src %>/rhodecode/utils/topics.js",
"<%= dirs.js.src %>/rhodecode/init.js",
"<%= dirs.js.src %>/rhodecode/changelog.js",
"<%= dirs.js.src %>/rhodecode/codemirror.js",
"<%= dirs.js.src %>/rhodecode/comments.js",
"<%= dirs.js.src %>/rhodecode/constants.js",
"<%= dirs.js.src %>/rhodecode/files.js",
@ -104,6 +95,21 @@
],
"dest": "<%= dirs.js.dest %>/scripts.js",
"nonull": true
},
"ext": {
"src": [
"<%= dirs.js.src %>/codemirror/codemirror.js",
"<%= dirs.js.src %>/codemirror/codemirror_loadmode.js",
"<%= dirs.js.src %>/codemirror/codemirror_hint.js",
"<%= dirs.js.src %>/codemirror/codemirror_overlay.js",
"<%= dirs.js.src %>/codemirror/codemirror_placeholder.js",
"<%= dirs.js.src %>/codemirror/codemirror_simplemode.js",
"<%= dirs.js.dest %>/mode/meta.js",
"<%= dirs.js.dest %>/mode/meta_ext.js",
"<%= dirs.js.src %>/rhodecode/codemirror.js"
],
"dest": "<%= dirs.js.dest %>/codemirror-dist.js",
"nonull": true
}
},
"terser": {
@ -146,8 +152,54 @@
},
"files": {
"<%= dirs.js.dest %>/scripts.min.js": "<%= dirs.js.dest %>/scripts.js"
}
},
"src": "<%= dirs.js.dest %>/scripts.js",
"dest": "<%= dirs.js.dest %>/scripts.min.js"
},
"ext": {
"options": {
"compress": {
"ecma": 6,
"arrows": false,
"collapse_vars": false,
"comparisons": false,
"computed_props": false,
"hoist_funs": false,
"hoist_props": false,
"hoist_vars": false,
"inline": false,
"loops": false,
"negate_iife": false,
"properties": false,
"reduce_funcs": false,
"reduce_vars": false,
"switches": false,
"toplevel": false,
"typeofs": false,
"booleans": true,
"if_return": true,
"sequences": true,
"unused": true,
"conditionals": true,
"dead_code": true,
"evaluate": true
},
"mangle": {
"keep_classnames": true,
"keep_fnames": false,
"reserved": ["noChange", "nothing"]
},
"output": {
"ecma": 6
}
},
"files": {
"<%= dirs.js.dest %>/scripts.min.js": "<%= dirs.js.dest %>/codemirror-dist.js"
},
"src": "<%= dirs.js.dest %>/codemirror-dist.js",
"dest": "<%= dirs.js.dest %>/codemirror-dist.min.js"
}
},
"less": {
"development": {

18
package-lock.json generated
View file

@ -60,6 +60,7 @@
"integrity": "sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@jridgewell/sourcemap-codec": "^1.5.0",
"@jridgewell/trace-mapping": "^0.3.24"
@ -71,6 +72,7 @@
"integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
"dev": true,
"license": "MIT",
"peer": true,
"engines": {
"node": ">=6.0.0"
}
@ -81,6 +83,7 @@
"integrity": "sha512-ZMp1V8ZFcPG5dIWnQLr3NSI1MiCU7UETdS/A0G8V/XWHvJv3ZsFqutJn1Y5RPmAPX6F3BiE397OqveU/9NCuIA==",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@jridgewell/gen-mapping": "^0.3.5",
"@jridgewell/trace-mapping": "^0.3.25"
@ -91,7 +94,8 @@
"resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz",
"integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==",
"dev": true,
"license": "MIT"
"license": "MIT",
"peer": true
},
"node_modules/@jridgewell/trace-mapping": {
"version": "0.3.31",
@ -99,6 +103,7 @@
"integrity": "sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@jridgewell/resolve-uri": "^3.1.0",
"@jridgewell/sourcemap-codec": "^1.4.14"
@ -352,6 +357,7 @@
"integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
"dev": true,
"license": "MIT",
"peer": true,
"bin": {
"acorn": "bin/acorn"
},
@ -365,7 +371,6 @@
"integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"fast-deep-equal": "^3.1.1",
"fast-json-stable-stringify": "^2.0.0",
@ -776,7 +781,6 @@
"integrity": "sha512-6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA==",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"babel-code-frame": "^6.26.0",
"babel-generator": "^6.26.0",
@ -4430,7 +4434,6 @@
"integrity": "sha512-/ABUy3gYWu5iBmrUSRBP97JLpQUm0GgVveDCp6t3yRNIoltIYw7rEj3g5y1o2PGPR2vfTRGa7WC/LZHLTXnEzA==",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"dateformat": "~4.6.2",
"eventemitter2": "~0.4.13",
@ -10451,6 +10454,7 @@
"integrity": "sha512-t/R3R/n0MSwnnazuPpPNVO60LX0SKL45pyl9YlvxIdkH0Of7D5qM2EVe+yASRIlY5pZ73nclYJfNANGWPwFDZw==",
"dev": true,
"license": "BSD-2-Clause",
"peer": true,
"dependencies": {
"@jridgewell/source-map": "^0.3.3",
"acorn": "^8.15.0",
@ -10766,7 +10770,8 @@
"resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
"integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
"dev": true,
"license": "MIT"
"license": "MIT",
"peer": true
},
"node_modules/terser/node_modules/source-map": {
"version": "0.6.1",
@ -10774,6 +10779,7 @@
"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
"dev": true,
"license": "BSD-3-Clause",
"peer": true,
"engines": {
"node": ">=0.10.0"
}
@ -10784,6 +10790,7 @@
"integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"buffer-from": "^1.0.0",
"source-map": "^0.6.0"
@ -11937,7 +11944,6 @@
"integrity": "sha512-6jJuJjg8znb/xRItk7bkT0+Q7AHCYjjFnvKIWQPkNIOyRqoCGvkOs0ipeQzrqz4l5FtN5ZI/ukEHroeX/o1/5Q==",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@webassemblyjs/ast": "1.9.0",
"@webassemblyjs/helper-module-context": "1.9.0",

949
rhodecode/public/js/src/codemirror/codemirror.js
View file

File diff suppressed because it is too large Load diff

2
rhodecode/templates/base/root.mako
View file

@ -144,8 +144,6 @@ c.template_context['attachment_store'] = {
<script> var alertMessagePayloads = ${h.flash.json_alerts(request=request)|n}; </script>
## avoide escaping the %N
<script language="javascript" type="text/javascript" src="${h.asset('js/scripts.min.js', ver=c.rhodecode_version_hash)}"></script>
<script>CodeMirror.modeURL = "${h.asset('') + 'js/mode/%N/%N.js?ver='+c.rhodecode_version_hash}";</script>
## JAVASCRIPT EXTRA - optionally inject some extra JS for specificed templates
${self.js_extra()}

2
rhodecode/templates/compare/compare_diff.mako
View file

@ -27,6 +27,8 @@
// set fake commitId on this commit-range page
templateContext.commit_data.commit_id = "${h.EmptyCommit().raw_id}";
</script>
<script language="javascript" type="text/javascript" src="${h.asset('js/codemirror-dist.min.js', ver=c.rhodecode_version_hash)}"></script>
<script>CodeMirror.modeURL = "${h.asset('') + 'js/mode/%N/%N.js?ver='+c.rhodecode_version_hash}";</script>
<div class="box">
<div class="summary changeset">

3
rhodecode/templates/data_table/_dt_elements.mako
View file

@ -535,6 +535,9 @@ ${h.style_metatag(tag_type, tag)|n,trim}
% endif
</div>
</div>
<script language="javascript" type="text/javascript" src="${h.asset('js/codemirror-dist.min.js', ver=c.rhodecode_version_hash)}"></script>
<script>CodeMirror.modeURL = "${h.asset('') + 'js/mode/%N/%N.js?ver='+c.rhodecode_version_hash}";</script>
<script type="text/javascript">
new MarkupForm('${form_id}');
</script>

3
rhodecode/templates/files/files_add.mako
View file

@ -19,6 +19,9 @@
<%def name="main()">
<script language="javascript" type="text/javascript" src="${h.asset('js/codemirror-dist.min.js', ver=c.rhodecode_version_hash)}"></script>
<script>CodeMirror.modeURL = "${h.asset('') + 'js/mode/%N/%N.js?ver='+c.rhodecode_version_hash}";</script>
<div class="box">
<div class="edit-file-title">