Commit ef6311d6 authored by Mike Greiling's avatar Mike Greiling Committed by Phil Hughes

Upgrade webpack and monaco-editor to latest

parent 47e6675c
...@@ -13,12 +13,12 @@ export default class Model { ...@@ -13,12 +13,12 @@ export default class Model {
(this.originalModel = monacoEditor.createModel( (this.originalModel = monacoEditor.createModel(
head ? head.content : this.file.raw, head ? head.content : this.file.raw,
undefined, undefined,
new Uri(false, false, `original/${this.path}`), new Uri('gitlab', false, `original/${this.path}`),
)), )),
(this.model = monacoEditor.createModel( (this.model = monacoEditor.createModel(
this.content, this.content,
undefined, undefined,
new Uri(false, false, this.path), new Uri('gitlab', false, this.path),
)), )),
); );
if (this.file.mrChange) { if (this.file.mrChange) {
...@@ -26,7 +26,7 @@ export default class Model { ...@@ -26,7 +26,7 @@ export default class Model {
(this.baseModel = monacoEditor.createModel( (this.baseModel = monacoEditor.createModel(
this.file.baseRaw, this.file.baseRaw,
undefined, undefined,
new Uri(false, false, `target/${this.path}`), new Uri('gitlab', false, `target/${this.path}`),
)), )),
); );
} }
......
...@@ -79,8 +79,8 @@ ...@@ -79,8 +79,8 @@
"katex": "^0.10.0", "katex": "^0.10.0",
"marked": "^0.3.12", "marked": "^0.3.12",
"mermaid": "^8.0.0-rc.8", "mermaid": "^8.0.0-rc.8",
"monaco-editor": "^0.14.3", "monaco-editor": "^0.15.6",
"monaco-editor-webpack-plugin": "^1.5.4", "monaco-editor-webpack-plugin": "^1.7.0",
"mousetrap": "^1.4.6", "mousetrap": "^1.4.6",
"pikaday": "^1.6.1", "pikaday": "^1.6.1",
"popper.js": "^1.14.3", "popper.js": "^1.14.3",
...@@ -112,7 +112,7 @@ ...@@ -112,7 +112,7 @@
"vue-template-compiler": "^2.5.21", "vue-template-compiler": "^2.5.21",
"vue-virtual-scroll-list": "^1.2.5", "vue-virtual-scroll-list": "^1.2.5",
"vuex": "^3.0.1", "vuex": "^3.0.1",
"webpack": "^4.28.1", "webpack": "^4.29.0",
"webpack-bundle-analyzer": "^3.0.3", "webpack-bundle-analyzer": "^3.0.3",
"webpack-cli": "^3.2.1", "webpack-cli": "^3.2.1",
"webpack-stats-plugin": "^0.2.1", "webpack-stats-plugin": "^0.2.1",
...@@ -160,12 +160,12 @@ ...@@ -160,12 +160,12 @@
"karma-mocha-reporter": "^2.2.5", "karma-mocha-reporter": "^2.2.5",
"karma-sourcemap-loader": "^0.3.7", "karma-sourcemap-loader": "^0.3.7",
"karma-webpack": "^4.0.0-beta.0", "karma-webpack": "^4.0.0-beta.0",
"nodemon": "^1.18.4", "nodemon": "^1.18.9",
"pixelmatch": "^4.0.2", "pixelmatch": "^4.0.2",
"prettier": "1.16.1", "prettier": "1.16.1",
"vue-jest": "^3.0.2", "vue-jest": "^3.0.2",
"webpack-dev-server": "^3.1.14", "webpack-dev-server": "^3.1.14",
"yarn-deduplicate": "^1.0.5" "yarn-deduplicate": "^1.1.0"
}, },
"engines": { "engines": {
"node": ">=8.10.0", "node": ">=8.10.0",
......
...@@ -56,7 +56,7 @@ describe('Multi-file editor library decorations controller', () => { ...@@ -56,7 +56,7 @@ describe('Multi-file editor library decorations controller', () => {
controller.addDecorations(model, 'key', [{ decoration: 'decorationValue' }]); controller.addDecorations(model, 'key', [{ decoration: 'decorationValue' }]);
expect(controller.decorations.size).toBe(1); expect(controller.decorations.size).toBe(1);
expect(controller.decorations.keys().next().value).toBe('path--path'); expect(controller.decorations.keys().next().value).toBe('gitlab:path--path');
}); });
it('calls decorate method', () => { it('calls decorate method', () => {
...@@ -90,7 +90,7 @@ describe('Multi-file editor library decorations controller', () => { ...@@ -90,7 +90,7 @@ describe('Multi-file editor library decorations controller', () => {
controller.decorate(model); controller.decorate(model);
expect(controller.editorDecorations.keys().next().value).toBe('path--path'); expect(controller.editorDecorations.keys().next().value).toBe('gitlab:path--path');
}); });
}); });
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment