Skip to content

Commit 51f4487

Browse files
committed
Fix CI error
1 parent 3c35d23 commit 51f4487

File tree

4 files changed

+18
-2
lines changed

4 files changed

+18
-2
lines changed

atest/05_Features/Configuration.robot

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@ Pyls Configuration
3131
Capture Page Screenshot 03-schema-diagnostic-found.png
3232
[Teardown] Clean Up After Working with File and Settings ${file}
3333

34+
# # # # # # # # # # # #
35+
# YAML schema functionality won't be available until yaml-language-server v0.7.3
36+
# # # # # # # # # # # #
3437
# YAML Schema
3538
# ${file} = Set Variable composer-schema.yaml
3639
# Prepare File for Editing YAML config ${file}

packages/jupyterlab-lsp/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
},
3838
"dependencies": {
3939
"@krassowski/jupyterlab_go_to_definition": "~1.0.0",
40-
"lodash.mergewith": "^4.6.1",
40+
"lodash.mergewith": "^4.6.1",
4141
"lsp-ws-connection": "~0.4.0"
4242
},
4343
"devDependencies": {
@@ -64,6 +64,7 @@
6464
"@types/codemirror": "^0.0.74",
6565
"@types/events": "^3.0.0",
6666
"@types/jest": "^23.3.11",
67+
"@types/lodash.mergewith": "^4.6.1",
6768
"chai": "^4.2.0",
6869
"codemirror": "*",
6970
"events": "^3.0.0",

packages/jupyterlab-lsp/src/utils.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { PageConfig } from '@jupyterlab/coreutils';
2-
import mergeWith from 'lodash/mergewith';
2+
import mergeWith from 'lodash.mergewith';
33

44
const RE_PATH_ANCHOR = /^file:\/\/([^\/]+|\/[A-Z]:)/;
55

yarn.lock

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2435,6 +2435,18 @@
24352435
resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.4.tgz#38fd73ddfd9b55abb1e1b2ed578cb55bd7b7d339"
24362436
integrity sha512-8+KAKzEvSUdeo+kmqnKrqgeE+LcA0tjYWFY7RPProVYwnqDjukzO+3b6dLD56rYX5TdWejnEOLJYOIeh4CXKuA==
24372437

2438+
"@types/lodash.mergewith@^4.6.1":
2439+
version "4.6.6"
2440+
resolved "https://registry.yarnpkg.com/@types/lodash.mergewith/-/lodash.mergewith-4.6.6.tgz#c4698f5b214a433ff35cb2c75ee6ec7f99d79f10"
2441+
integrity sha512-RY/8IaVENjG19rxTZu9Nukqh0W2UrYgmBj5sdns4hWRZaV8PqR7wIKHFKzvOTjo4zVRV7sVI+yFhAJql12Kfqg==
2442+
dependencies:
2443+
"@types/lodash" "*"
2444+
2445+
"@types/lodash@*":
2446+
version "4.14.150"
2447+
resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.150.tgz#649fe44684c3f1fcb6164d943c5a61977e8cf0bd"
2448+
integrity sha512-kMNLM5JBcasgYscD9x/Gvr6lTAv2NVgsKtet/hm93qMyf/D1pt+7jeEZklKJKxMVmXjxbRVQQGfqDSfipYCO6w==
2449+
24382450
"@types/lodash@^4.14.110":
24392451
version "4.14.149"
24402452
resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.149.tgz#1342d63d948c6062838fbf961012f74d4e638440"

0 commit comments

Comments
 (0)