Merge pull request #1523 from laws-africa/latest-monaco

monaco 0.33.0
laws-africa · Jul 12, 2022 · 6efaa89 · 6efaa89
2 parents aca53b4 + cb574a7
commit 6efaa89
Show file tree

Hide file tree

Showing 11 changed files with 55 additions and 2,634 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -25,9 +25,13 @@ jobs:
       - name: Build
         run: npx webpack
 
-      - name: Import indigo-web
-        # Keep the local copy of indigo-web up to date; this is only used for PDF exports
-        run: cp -R node_modules/indigo-web/scss indigo_app/static/lib/indigo-web/
+      - name: Copy node dependencies
+        # Keep the local copy of some node dependencies up to date
+        # indigo-web: only used for PDF exports
+        # monaco-editor
+        run: |
+          - cp -R node_modules/indigo-web/scss indigo_app/static/lib/indigo-web/
+          - cp -R node_modules/monaco-editor/min/vs/{base,basic-languages,editor,loader.js} indigo_app/static/lib/monaco-editor/
 
       - name: Push
         uses: EndBug/add-and-commit@v7

diff --git a/indigo_app/static/lib/monaco-editor-0.20.0/base/browser/ui/codiconLabel/codicon/codicon.ttf b/indigo_app/static/lib/monaco-editor-0.20.0/base/browser/ui/codiconLabel/codicon/codicon.ttf
diff --git a/indigo_app/static/lib/monaco-editor-0.20.0/base/worker/workerMain.js b/indigo_app/static/lib/monaco-editor-0.20.0/base/worker/workerMain.js
diff --git a/indigo_app/static/lib/monaco-editor-0.20.0/basic-languages/xml/xml.js b/indigo_app/static/lib/monaco-editor-0.20.0/basic-languages/xml/xml.js
diff --git a/indigo_app/static/lib/monaco-editor-0.20.0/editor/editor.main.css b/indigo_app/static/lib/monaco-editor-0.20.0/editor/editor.main.css
diff --git a/indigo_app/static/lib/monaco-editor-0.20.0/editor/editor.main.js b/indigo_app/static/lib/monaco-editor-0.20.0/editor/editor.main.js
diff --git a/indigo_app/static/lib/monaco-editor-0.20.0/editor/editor.main.nls.js b/indigo_app/static/lib/monaco-editor-0.20.0/editor/editor.main.nls.js
diff --git a/indigo_app/static/lib/monaco-editor-0.20.0/loader.js b/indigo_app/static/lib/monaco-editor-0.20.0/loader.js
diff --git a/indigo_app/templates/indigo_api/document/show.html b/indigo_app/templates/indigo_api/document/show.html
@@ -137,8 +137,8 @@ <h5 class="main-header-title">
 
   <script type="text/javascript" src="{% static 'ckeditor/ckeditor.js' %}"></script>
 
-  <script src="{% static 'lib/monaco-editor-0.20.0/loader.js' %}"></script>
-  <script src="{% static 'lib/monaco-editor-0.20.0/editor/editor.main.nls.js' %}"></script>
-  <script src="{% static 'lib/monaco-editor-0.20.0/editor/editor.main.js' %}"></script>
+  <script src="{% static 'lib/monaco-editor/loader.js' %}"></script>
+  <script src="{% static 'lib/monaco-editor/editor/editor.main.nls.js' %}"></script>
+  <script src="{% static 'lib/monaco-editor/editor/editor.main.js' %}"></script>
 
 {% endblock %}
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -8,7 +8,7 @@
   },
   "devDependencies": {
     "@fortawesome/fontawesome-free": "^5.2.0",
-    "@lawsafrica/indigo-akn": "^5.1.0",
+    "@lawsafrica/indigo-akn": "^5.1.1",
     "@lawsafrica/web-components": "^0.7.3-beta",
     "bootstrap": "^4.3.1",
     "bootstrap-select": "^1.13.18",
@@ -26,7 +26,7 @@
     "eslint-webpack-plugin": "^3.2.0",
     "indigo-web": "^8.1.2",
     "lodash": "^4.17.21",
-    "monaco-editor": "^0.20.0",
+    "monaco-editor": "^0.33.0",
     "sass-loader": "^13.0.2",
     "style-loader": "^2.0.0",
     "ts-loader": "^8.1.0",