diff --git a/.gitignore b/.gitignore index bdd3ac98876e22e4fd52c55a8aa92f7d6e4edc56..bf209d9c7ac0acff98baae812c99c7f9d5c4908c 100644 --- a/.gitignore +++ b/.gitignore @@ -47,6 +47,7 @@ eslint-report.html /config/secrets.yml /config/sidekiq.yml /config/registry.key +/config/.webpack-cache/ /coverage/* /db/*.sqlite3 /db/*.sqlite3-journal diff --git a/.gitlab/ci/frontend.gitlab-ci.yml b/.gitlab/ci/frontend.gitlab-ci.yml index a45db09b60270e51b908113997895c252ec4a27d..25a348ba7daaa62bedeae18a3b9cadce8a8a5b61 100644 --- a/.gitlab/ci/frontend.gitlab-ci.yml +++ b/.gitlab/ci/frontend.gitlab-ci.yml @@ -10,7 +10,6 @@ extends: - .default-retry - .default-before_script - - .assets-compile-cache image: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images/debian-${DEBIAN_VERSION}-ruby-${RUBY_VERSION}-node-16.14:rubygems-3.2-git-2.33-lfs-2.9-yarn-1.22-graphicsmagick-1.3.36 variables: SETUP_DB: "false" diff --git a/app/assets/javascripts/editor/extensions/source_editor_webide_ext.js b/app/assets/javascripts/editor/extensions/source_editor_webide_ext.js index 6270517b3f3ca92658fd95d10115a9c325a04b19..bacc05af3f140288732c0b8cdceab7ccc5d5576b 100644 --- a/app/assets/javascripts/editor/extensions/source_editor_webide_ext.js +++ b/app/assets/javascripts/editor/extensions/source_editor_webide_ext.js @@ -60,7 +60,7 @@ const renderSideBySide = (domElement) => { const updateDiffInstanceRendering = (instance) => { instance.updateOptions({ - renderSideBySide: renderSideBySide(instance.getDomNode()), + renderSideBySide: renderSideBySide(instance.getContainerDomNode()), }); }; diff --git a/app/assets/javascripts/editor/utils.js b/app/assets/javascripts/editor/utils.js index df9d3f2b9fb9d8cdc429f5506c6e73d3f7809471..d290119fd377fabb5e3589a13f7b42b436667aac 100644 --- a/app/assets/javascripts/editor/utils.js +++ b/app/assets/javascripts/editor/utils.js @@ -26,7 +26,8 @@ export const getBlobLanguage = (blobPath) => { const ext = `.${blobPath.split('.').pop()}`; const language = monacoLanguages .getLanguages() - .find((lang) => lang.extensions.indexOf(ext) !== -1); + // extensions is optional: https://microsoft.github.io/monaco-editor/api/interfaces/monaco.languages.ILanguageExtensionPoint.html#extensions + .find((lang) => lang.extensions && lang.extensions.indexOf(ext) !== -1); return language ? language.id : defaultLanguage; }; diff --git a/app/assets/javascripts/ide/components/repo_editor.vue b/app/assets/javascripts/ide/components/repo_editor.vue index a1396995a3b5e5b4210b4245724c06e47ffe3874..fb7fef0af4d804f7be263e50a26e2267523dce42 100644 --- a/app/assets/javascripts/ide/components/repo_editor.vue +++ b/app/assets/javascripts/ide/components/repo_editor.vue @@ -354,7 +354,6 @@ export default { } this.isEditorLoading = false; - this.model.updateOptions(this.rules); this.model.onChange((model) => { diff --git a/app/assets/javascripts/ide/utils.js b/app/assets/javascripts/ide/utils.js index a7e6506b045450756e7cac840061ff9413864c80..6cc95effcc36f28a39a9c3a680b7e4ae248431d7 100644 --- a/app/assets/javascripts/ide/utils.js +++ b/app/assets/javascripts/ide/utils.js @@ -1,5 +1,6 @@ import { flatten, isString } from 'lodash'; import { languages } from 'monaco-editor'; +import { yamlDefaults } from 'monaco-yaml'; import { performanceMarkAndMeasure } from '~/performance/utils'; import { SIDE_LEFT, SIDE_RIGHT } from './constants'; @@ -82,7 +83,8 @@ export function registerLanguages(def, ...defs) { } export function registerSchema(schema, options = {}) { - const defaults = [languages.json.jsonDefaults, languages.yaml.yamlDefaults]; + // yamlDefaults is now an export -- see https://github.com/remcohaszing/monaco-yaml/pull/172 + const defaults = [languages.json.jsonDefaults, yamlDefaults]; defaults.forEach((d) => d.setDiagnosticsOptions({ validate: true, diff --git a/app/assets/javascripts/pdf/index.vue b/app/assets/javascripts/pdf/index.vue index 644eccc023258825a5216d438df21e1b5acaa589..ca172984d3840d18706522201f87caa65a2473dd 100644 --- a/app/assets/javascripts/pdf/index.vue +++ b/app/assets/javascripts/pdf/index.vue @@ -1,5 +1,5 @@