Skip to content

Commit 42362d8

Browse files
fix: lerna upgrade (#627)
* fix: lerna upgrade * fix: fake logger * fix: linter * fix: cds version --------- Co-authored-by: Maruf Rasully <[email protected]>
1 parent 59b39a8 commit 42362d8

File tree

6 files changed

+1014
-1344
lines changed

6 files changed

+1014
-1344
lines changed

.changeset/sweet-clouds-remain.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
"vscode-ui5-language-assistant": patch
3+
"@ui5-language-assistant/vscode-ui5-language-assistant-bas-ext": patch
4+
---
5+
6+
Lerna version bump to fix deployment to npm repo

lerna.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
{
22
"packages": ["packages/*", "test-packages/*"],
3-
"useWorkspaces": true,
43
"npmClient": "yarn",
54
"version": "4.0.5",
65
"command": {

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
"jest-sonar": "0.2.16",
7676
"jest-specific-snapshot": "3.0.0",
7777
"klaw-sync": "6.0.0",
78-
"lerna": "6.0.3",
78+
"lerna": "^7.0.2",
7979
"lint-staged": "10.5.3",
8080
"make-dir": "3.1.0",
8181
"mock-fs": "^5.2.0",

packages/context/test/unit/ui5-model.test.ts

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,25 @@
1+
jest.mock("@ui5-language-assistant/logic-utils", () => {
2+
const actual = jest.requireActual("@ui5-language-assistant/logic-utils");
3+
4+
return {
5+
...actual,
6+
getLogger: (name: string) => {
7+
const logger = actual.getLogger(name);
8+
return {
9+
...logger,
10+
fatal: (m, ...args: unknown[]) =>
11+
console.log(`Fatal: ${m}, ${JSON.stringify(args)}`),
12+
error: (m, ...args: unknown[]) =>
13+
console.log(`Error: ${m}, ${JSON.stringify(args)}`),
14+
warn: (m, ...args: unknown[]) =>
15+
console.log(`Warning: ${m}, ${JSON.stringify(args)}`),
16+
info: (m, ...args: unknown[]) =>
17+
console.log(`Info: ${m}, ${JSON.stringify(args)}}`),
18+
};
19+
},
20+
};
21+
});
22+
123
import { dir as tempDir, file as tempFile } from "tmp-promise";
224
import { readdir, mkdirs, writeFile } from "fs-extra";
325
import { sync as rimrafSync } from "rimraf";
@@ -16,7 +38,7 @@ import { FetchResponse } from "@ui5-language-assistant/language-server";
1638

1739
describe("the UI5 language assistant ui5 model", () => {
1840
// The default timeout is 2000ms and getSemanticModel can take ~3000-5000ms
19-
const GET_MODEL_TIMEOUT = 20000;
41+
const GET_MODEL_TIMEOUT = 30000;
2042
const FRAMEWORK = "SAPUI5";
2143
const OPEN_FRAMEWORK = "OpenUI5";
2244
const VERSION = "1.71.49";

test-packages/framework/projects/cap/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"node": ">=14"
77
},
88
"dependencies": {
9-
"@sap/cds": ">=5.4.5",
9+
"@sap/cds": "^6.8",
1010
"@sap/xssec": "^3.2.7",
1111
"express": "^4",
1212
"hdb": "^0.19.1",

0 commit comments

Comments
 (0)