kallithea Changeset - bf514091b27f

Changeset - bf514091b27f

Parent rev.

Child rev.

[Not reviewed]

default

! ! !

Mads Kiilerich (mads) - 7 years ago 2018-12-10 23:32:39
mads@kiilerich.com

front-end: Use codemirror from node_modules and stop bundling it

6 files changed:

.hgignore

LICENSE.md

kallithea/bin/kallithea_cli_front_end.py

kallithea/front-end/package.json

kallithea/public/codemirror/LICENSE

kallithea/public/codemirror/lib/codemirror.css

309

0 comments (0 inline, 0 general)

.hgignore

➞

Show inline comments

@@ @@ -24,6 +24,7 @@ syntax: regexp @@
 ^kallithea/front-end/node_modules$
 ^kallithea/front-end/package-lock\.json$
 ^kallithea/front-end/tmp$
 ^kallithea/public/codemirror$
 ^kallithea/public/css/select2-spinner\.gif$
 ^kallithea/public/css/select2\.png$
 ^kallithea/public/css/select2x2\.png$

LICENSE.md

➞

Show inline comments

@@ @@ -54,7 +54,7 @@ using the ''kallithea-cli front-end-buil @@
 Codemirror
 ----------
-Kallithea incorporates parts of the Javascript system called
+Kallithea uses the Javascript system called
 [Codemirror](http://codemirror.net/), version 4.7.0, which is primarily:
 Copyright &copy; 2013-2014 by Marijn Haverbeke <marijnh@gmail.com>
@@ @@ -63,10 +63,10 @@ and licensed under the MIT-permissive li @@
 [included in this distribution](MIT-Permissive-License.txt).
 Additional files from upstream Codemirror are copyrighted by various authors
 and licensed under other permissive licenses.  The sub-directories under
 [.../public/codemirror](kallithea/public/codemirror) include the copyright and
 license notice and information as they appeared in Codemirror's upstream
 release.
 and licensed under other permissive licenses.
 It is not distributed with Kallithea, but will be downloaded
 using the ''kallithea-cli front-end-build'' command.

kallithea/bin/kallithea_cli_front_end.py

➞

Show inline comments

@@ @@ -82,6 +82,11 @@ def front_end_build(install_deps, genera @@
         shutil.copy(os.path.join(front_end_dir, 'node_modules', 'select2', 'select2x2.png'), os.path.join(public_dir, 'css', 'select2x2.png'))
         shutil.copy(os.path.join(front_end_dir, 'node_modules', 'select2', 'select2-spinner.gif'), os.path.join(public_dir, 'css', 'select2-spinner.gif'))
         click.echo("Preparing CodeMirror JS")
         if os.path.isdir(os.path.join(public_dir, 'codemirror')):
             shutil.rmtree(os.path.join(public_dir, 'codemirror'))
         shutil.copytree(os.path.join(front_end_dir, 'node_modules', 'codemirror'), os.path.join(public_dir, 'codemirror'))
         click.echo("Generating LICENSES.txt")
         check_licensing_json_path = os.path.join(tmp_dir, 'licensing.json')
         licensing_txt_path = os.path.join(public_dir, 'LICENSES.txt')

kallithea/front-end/package.json

➞

Show inline comments

@@ @@ -3,6 +3,7 @@ @@
   "private": true,
   "dependencies": {
     "bootstrap": "3.3.7",
     "codemirror": "4.7",
     "datatables.net": "1.10.13",
     "datatables.net-bs": "1.10.13",
     "jquery": "1.12.3",

kallithea/public/codemirror/LICENSE

➞

Show inline comments

deleted file

kallithea/public/codemirror/lib/codemirror.css

➞

Show inline comments

deleted file

0 comments (0 inline, 0 general)